From 876aef98e10073b26bdd54fd996e4675b36e19c1 Mon Sep 17 00:00:00 2001
From: Toni Uhlig <matzeton@googlemail.com>
Date: Fri, 5 Jan 2024 11:26:53 +0100
Subject: Improved collectd example.

 * similiar behavior to influxd example
 * gauges and counters are now handled properly

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
---
 CMakeLists.txt                                     |    2 +-
 examples/c-collectd/c-collectd.c                   | 1536 ++++++++++++++------
 examples/c-collectd/rrdgraph.sh                    |  231 ++-
 examples/c-collectd/www/dpi/categories.html        |   12 +
 examples/c-collectd/www/dpi/detections.html        |   31 +
 examples/c-collectd/www/dpi/events.html            |   31 +-
 examples/c-collectd/www/dpi/flows.html             |   12 +
 examples/c-collectd/www/dpi/index.html             |   50 +
 examples/c-collectd/www/dpi/jsons.html             |   12 +
 examples/c-collectd/www/dpi/other.html             |   12 +
 examples/c-collectd/www/dpi/risks.html             |  198 +++
 test/results/stats/caches_cfg/ookla.pcap.out       |  117 +-
 test/results/stats/caches_cfg/teams.pcap.out       |  143 +-
 test/results/stats/default/1kxun.pcap.out          |  161 +-
 test/results/stats/default/443-chrome.pcap.out     |  103 +-
 test/results/stats/default/443-curl.pcap.out       |  107 +-
 test/results/stats/default/443-firefox.pcap.out    |  107 +-
 test/results/stats/default/443-git.pcap.out        |  107 +-
 test/results/stats/default/443-opvn.pcap.out       |  103 +-
 test/results/stats/default/443-safari.pcap.out     |  107 +-
 test/results/stats/default/4in4tunnel.pcap.out     |  103 +-
 test/results/stats/default/4in6tunnel.pcap.out     |  103 +-
 test/results/stats/default/6in4tunnel.pcap.out     |  103 +-
 test/results/stats/default/6in6tunnel.pcap.out     |  103 +-
 .../stats/default/BGP_Cisco_hdlc_slarp.pcap.out    |  103 +-
 test/results/stats/default/BGP_redist.pcap.out     |  103 +-
 test/results/stats/default/EAQ.pcap.out            |  115 +-
 .../default/FAX-Call-t38-CA-TDM-SIP-FB-1.pcap.out  |  109 +-
 test/results/stats/default/IEC104.pcap.out         |  109 +-
 test/results/stats/default/KakaoTalk_chat.pcap.out |  135 +-
 test/results/stats/default/KakaoTalk_talk.pcap.out |  125 +-
 test/results/stats/default/NTPv2.pcap.out          |  103 +-
 test/results/stats/default/NTPv3.pcap.out          |  103 +-
 test/results/stats/default/NTPv4.pcap.out          |  103 +-
 test/results/stats/default/Oscar.pcap.out          |  103 +-
 test/results/stats/default/TivoDVR.pcap.out        |  103 +-
 test/results/stats/default/WebattackRCE.pcap.out   |  125 +-
 .../results/stats/default/WebattackSQLinj.pcap.out |  111 +-
 test/results/stats/default/WebattackXSS.pcap.out   |  111 +-
 test/results/stats/default/activision.pcap.out     |  107 +-
 test/results/stats/default/adult_content.pcap.out  |  111 +-
 test/results/stats/default/afp.pcap.out            |  103 +-
 test/results/stats/default/agora-sd-rtn.pcap.out   |  107 +-
 test/results/stats/default/ah.pcapng.out           |  103 +-
 test/results/stats/default/ajp.pcap.out            |  103 +-
 test/results/stats/default/alexa-app.pcapng.out    |  139 +-
 test/results/stats/default/alicloud.pcap.out       |  103 +-
 test/results/stats/default/among_us.pcap.out       |  103 +-
 test/results/stats/default/amqp.pcap.out           |  103 +-
 test/results/stats/default/android.pcap.out        |  129 +-
 test/results/stats/default/anyconnect-vpn.pcap.out |  151 +-
 test/results/stats/default/anydesk.pcapng.out      |  135 +-
 test/results/stats/default/avast.pcap.out          |  103 +-
 .../stats/default/avast_securedns.pcapng.out       |  107 +-
 test/results/stats/default/bacnet.pcap.out         |  107 +-
 .../results/stats/default/bad-dns-traffic.pcap.out |  123 +-
 test/results/stats/default/badpackets.pcap.out     |  103 +-
 test/results/stats/default/bets.pcapng.out         |  107 +-
 test/results/stats/default/bitcoin.pcap.out        |  103 +-
 test/results/stats/default/bittorrent.pcap.out     |  111 +-
 .../stats/default/bittorrent_tcp_miss.pcapng.out   |  111 +-
 test/results/stats/default/bittorrent_utp.pcap.out |  117 +-
 test/results/stats/default/bjnp.pcap.out           |  103 +-
 test/results/stats/default/bot.pcap.out            |  107 +-
 test/results/stats/default/bt-dns.pcap.out         |  107 +-
 test/results/stats/default/bt-http.pcapng.out      |  107 +-
 test/results/stats/default/bt_search.pcap.out      |  107 +-
 test/results/stats/default/cachefly.pcapng.out     |  111 +-
 test/results/stats/default/can.pcap.out            |  107 +-
 test/results/stats/default/capwap.pcap.out         |  107 +-
 test/results/stats/default/capwap_data.pcapng.out  |  103 +-
 test/results/stats/default/cassandra.pcap.out      |  103 +-
 test/results/stats/default/check_mk_new.pcap.out   |  103 +-
 test/results/stats/default/chrome.pcap.out         |  107 +-
 test/results/stats/default/citrix.pcap.out         |  103 +-
 .../results/stats/default/cloudflare-warp.pcap.out |  113 +-
 test/results/stats/default/coap_mqtt.pcap.out      |  111 +-
 test/results/stats/default/collectd.pcap.out       |  107 +-
 test/results/stats/default/corba.pcap.out          |  103 +-
 test/results/stats/default/cpha.pcap.out           |  103 +-
 .../default/crawler_false_positive.pcapng.out      |  111 +-
 test/results/stats/default/crynet.pcap.out         |  103 +-
 .../stats/default/custom_categories.pcapng.out     |  117 +-
 .../stats/default/custom_risk_mask.pcapng.out      |  107 +-
 .../stats/default/custom_rules_ipv6.pcapng.out     |  103 +-
 .../custom_rules_same-ip_multiple_ports.pcapng.out |  103 +-
 test/results/stats/default/dazn.pcapng.out         |  107 +-
 test/results/stats/default/dcerpc.pcap.out         |  103 +-
 test/results/stats/default/dhcp-fuzz.pcapng.out    |  103 +-
 test/results/stats/default/diameter.pcap.out       |  103 +-
 test/results/stats/default/discord.pcap.out        |  111 +-
 .../stats/default/discord_mid_flow.pcap.out        |  103 +-
 test/results/stats/default/dlt_ppp.pcap.out        |  103 +-
 test/results/stats/default/dnp3.pcap.out           |  105 +-
 test/results/stats/default/dns-exf.pcap.out        |  119 +-
 .../stats/default/dns-google-nsid.pcapng.out       |  109 +-
 .../stats/default/dns-invalid-chars.pcap.out       |  111 +-
 .../stats/default/dns-tunnel-iodine.pcap.out       |  115 +-
 test/results/stats/default/dns2tcp_tunnel.pcap.out |  115 +-
 .../stats/default/dns_ambiguous_names.pcap.out     |  119 +-
 test/results/stats/default/dns_doh.pcap.out        |  107 +-
 test/results/stats/default/dns_dot.pcap.out        |  119 +-
 .../stats/default/dns_exfiltration.pcap.out        |  115 +-
 test/results/stats/default/dns_fragmented.pcap.out |  121 +-
 .../stats/default/dns_invert_query.pcapng.out      |  103 +-
 .../stats/default/dns_long_domainname.pcap.out     |  111 +-
 .../dnscrypt-v1-and-resolver-pings.pcap.out        |  107 +-
 .../results/stats/default/dnscrypt-v2-doh.pcap.out |  115 +-
 test/results/stats/default/dnscrypt-v2.pcap.out    |  103 +-
 .../dnscrypt_skype_false_positive.pcapng.out       |  107 +-
 test/results/stats/default/doh.pcapng.out          |  115 +-
 test/results/stats/default/doq.pcapng.out          |  107 +-
 test/results/stats/default/doq_adguard.pcapng.out  |  103 +-
 .../stats/default/dos_win98_smb_netbeui.pcap.out   |  115 +-
 test/results/stats/default/drda_db2.pcap.out       |  103 +-
 test/results/stats/default/dropbox.pcap.out        |  113 +-
 test/results/stats/default/dtls.pcap.out           |  119 +-
 test/results/stats/default/dtls2.pcap.out          |  119 +-
 .../stats/default/dtls_certificate.pcapng.out      |  107 +-
 .../default/dtls_certificate_fragments.pcap.out    |  129 +-
 .../stats/default/dtls_mid_sessions.pcapng.out     |  103 +-
 .../stats/default/dtls_old_version.pcapng.out      |  117 +-
 .../dtls_session_id_and_coockie_both.pcap.out      |  115 +-
 test/results/stats/default/edonkey.pcap.out        |  111 +-
 test/results/stats/default/elasticsearch.pcap.out  |  103 +-
 test/results/stats/default/emotet.pcap.out         |  131 +-
 test/results/stats/default/encrypted_sni.pcap.out  |  103 +-
 test/results/stats/default/epicgames.pcapng.out    |  103 +-
 test/results/stats/default/esp.pcapng.out          |  103 +-
 test/results/stats/default/ethereum.pcap.out       |  103 +-
 test/results/stats/default/ethernetIP.pcap.out     |  103 +-
 test/results/stats/default/exe_download.pcap.out   |  119 +-
 .../stats/default/exe_download_as_png.pcap.out     |  119 +-
 test/results/stats/default/facebook.pcap.out       |  107 +-
 test/results/stats/default/fastcgi.pcap.out        |  103 +-
 test/results/stats/default/firefox.pcap.out        |  107 +-
 test/results/stats/default/fix.pcap.out            |  103 +-
 test/results/stats/default/fix2.pcap.out           |  103 +-
 test/results/stats/default/forticlient.pcap.out    |  121 +-
 test/results/stats/default/ftp-start-tls.pcap.out  |  125 +-
 test/results/stats/default/ftp.pcap.out            |  119 +-
 test/results/stats/default/ftp_failed.pcap.out     |  115 +-
 .../stats/default/fuzz-2006-06-26-2594.pcap.out    |  139 +-
 .../stats/default/fuzz-2006-09-29-28586.pcap.out   |  117 +-
 .../stats/default/fuzz-2020-02-16-11740.pcap.out   |  107 +-
 .../default/fuzz-2021-06-07-c6c72a0a56.pcap.out    |  103 +-
 .../results/stats/default/fuzz-2021-10-13.pcap.out |  103 +-
 test/results/stats/default/geforcenow.pcapng.out   |  131 +-
 test/results/stats/default/genshin-impact.pcap.out |  107 +-
 test/results/stats/default/git.pcap.out            |  103 +-
 test/results/stats/default/gnutella.pcap.out       |  151 +-
 test/results/stats/default/google_ssl.pcap.out     |  103 +-
 .../stats/default/googledns_android10.pcap.out     |  111 +-
 test/results/stats/default/gquic.pcap.out          |  103 +-
 test/results/stats/default/gtp_c.pcap.out          |  103 +-
 .../stats/default/gtp_false_positive.pcapng.out    |  103 +-
 test/results/stats/default/gtp_prime.pcapng.out    |  103 +-
 test/results/stats/default/h323-overflow.pcap.out  |  103 +-
 test/results/stats/default/h323.pcap.out           |  103 +-
 test/results/stats/default/haproxy.pcap.out        |  103 +-
 .../default/heuristic_tcp_ack_payload.pcap.out     |  103 +-
 test/results/stats/default/hots.pcapng.out         |  107 +-
 test/results/stats/default/hpvirtgrp.pcap.out      |  103 +-
 test/results/stats/default/hsrp0.pcap.out          |  103 +-
 test/results/stats/default/hsrp2.pcap.out          |  103 +-
 test/results/stats/default/hsrp2_ipv6.pcapng.out   |  111 +-
 .../http-crash-content-disposition.pcap.out        |  103 +-
 .../stats/default/http-lines-split.pcap.out        |  115 +-
 .../stats/default/http-manipulated.pcap.out        |  107 +-
 test/results/stats/default/http-proxy.pcapng.out   |  103 +-
 test/results/stats/default/http2.pcapng.out        |  103 +-
 .../stats/default/http_asymmetric.pcapng.out       |  119 +-
 test/results/stats/default/http_auth.pcap.out      |  115 +-
 test/results/stats/default/http_connect.pcap.out   |  111 +-
 .../http_guessed_host_and_guessed.pcapng.out       |  103 +-
 .../stats/default/http_invalid_server.pcap.out     |  115 +-
 test/results/stats/default/http_ipv6.pcap.out      |  121 +-
 .../stats/default/http_on_sip_port.pcap.out        |  119 +-
 .../http_origin_different_than_host.pcap.out       |  103 +-
 .../default/http_starting_with_reply.pcapng.out    |  115 +-
 .../http_ua_splitted_in_two_pkts.pcapng.out        |  107 +-
 test/results/stats/default/i3d.pcap.out            |  103 +-
 test/results/stats/default/iax.pcap.out            |  103 +-
 test/results/stats/default/icmp-tunnel.pcap.out    |  111 +-
 test/results/stats/default/iec60780-5-104.pcap.out |  105 +-
 test/results/stats/default/imap-starttls.pcap.out  |  119 +-
 test/results/stats/default/imap.pcap.out           |  111 +-
 test/results/stats/default/imaps.pcap.out          |  111 +-
 test/results/stats/default/imo.pcap.out            |  103 +-
 test/results/stats/default/instagram.pcap.out      |  117 +-
 .../stats/default/ip_fragmented_garbage.pcap.out   |  103 +-
 test/results/stats/default/iphone.pcap.out         |  117 +-
 test/results/stats/default/ipp.pcap.out            |  111 +-
 .../stats/default/ipsec_isakmp_esp.pcap.out        |  111 +-
 test/results/stats/default/ipv6_in_gtp.pcap.out    |  103 +-
 test/results/stats/default/irc.pcap.out            |  115 +-
 .../default/ja3_lots_of_cipher_suites.pcap.out     |  103 +-
 .../ja3_lots_of_cipher_suites_2_anon.pcap.out      |  103 +-
 test/results/stats/default/jabber.pcap.out         |  103 +-
 test/results/stats/default/kerberos-error.pcap.out |  103 +-
 test/results/stats/default/kerberos-login.pcap.out |  107 +-
 test/results/stats/default/kerberos.pcap.out       |  107 +-
 .../results/stats/default/kerberos_fuzz.pcapng.out |  103 +-
 test/results/stats/default/kismet.pcap.out         |  103 +-
 test/results/stats/default/kontiki.pcap.out        |  107 +-
 test/results/stats/default/line.pcap.out           |  113 +-
 .../stats/default/linecall_falsepositve.pcap.out   |  103 +-
 .../stats/default/lisp_registration.pcap.out       |  103 +-
 .../stats/default/log4j-webapp-exploit.pcap.out    |  125 +-
 .../stats/default/long_tls_certificate.pcap.out    |  107 +-
 .../stats/default/lru_ipv6_caches.pcapng.out       |  119 +-
 test/results/stats/default/malformed_dns.pcap.out  |  119 +-
 test/results/stats/default/malformed_icmp.pcap.out |  107 +-
 test/results/stats/default/malware.pcap.out        |  115 +-
 test/results/stats/default/memcached.cap.out       |  103 +-
 test/results/stats/default/merakicloud.pcapng.out  |  107 +-
 test/results/stats/default/mgcp.pcap.out           |  107 +-
 test/results/stats/default/modbus.pcap.out         |  105 +-
 test/results/stats/default/monero.pcap.out         |  107 +-
 .../stats/default/mongo_false_positive.pcapng.out  |  103 +-
 test/results/stats/default/mongodb.pcap.out        |  107 +-
 test/results/stats/default/mpeg-dash.pcap.out      |  111 +-
 test/results/stats/default/mpeg.pcap.out           |  107 +-
 test/results/stats/default/mpegts.pcap.out         |  103 +-
 test/results/stats/default/mqtt.pcap.out           |  103 +-
 test/results/stats/default/mssql_tds.pcap.out      |  103 +-
 test/results/stats/default/mullvad_dns.pcap.out    |  107 +-
 .../stats/default/mullvad_wireguard.pcap.out       |  107 +-
 test/results/stats/default/munin.pcap.out          |  103 +-
 test/results/stats/default/mysql-8.pcap.out        |  103 +-
 test/results/stats/default/natpmp.pcap.out         |  111 +-
 test/results/stats/default/nats.pcap.out           |  103 +-
 ...ndpi_match_string_subprotocol__error.pcapng.out |  119 +-
 test/results/stats/default/nest_log_sink.pcap.out  |  111 +-
 test/results/stats/default/netbios.pcap.out        |  113 +-
 .../default/netbios_wildcard_dns_query.pcap.out    |  103 +-
 test/results/stats/default/netflix.pcap.out        |  135 +-
 test/results/stats/default/netflow-fritz.pcap.out  |  103 +-
 test/results/stats/default/netflowv9.pcap.out      |  107 +-
 test/results/stats/default/nfsv2.pcap.out          |  107 +-
 test/results/stats/default/nfsv3.pcap.out          |  107 +-
 test/results/stats/default/nintendo.pcap.out       |  113 +-
 test/results/stats/default/nntp.pcap.out           |  103 +-
 test/results/stats/default/no_sni.pcap.out         |  115 +-
 test/results/stats/default/ocs.pcap.out            |  127 +-
 test/results/stats/default/ocsp.pcapng.out         |  103 +-
 test/results/stats/default/oicq.pcap.out           |  107 +-
 test/results/stats/default/ookla.pcap.out          |  117 +-
 test/results/stats/default/openvpn.pcap.out        |  107 +-
 test/results/stats/default/opera-vpn.pcapng.out    |  111 +-
 test/results/stats/default/oracle12.pcapng.out     |  103 +-
 test/results/stats/default/os_detected.pcapng.out  |  111 +-
 .../stats/default/ospfv2_add_new_prefix.pcap.out   |  103 +-
 .../default/ossfuzz_seed_fake_traces_1.pcapng.out  |  127 +-
 .../default/ossfuzz_seed_fake_traces_2.pcapng.out  |  103 +-
 .../default/ossfuzz_seed_fake_traces_3.pcapng.out  |  103 +-
 .../default/ossfuzz_seed_fake_traces_4.pcapng.out  |  103 +-
 test/results/stats/default/pgm.pcap.out            |  103 +-
 test/results/stats/default/pgsql.pcap.out          |  103 +-
 test/results/stats/default/pim.pcap.out            |  103 +-
 test/results/stats/default/pinterest.pcap.out      |  123 +-
 test/results/stats/default/pluralsight.pcap.out    |  107 +-
 test/results/stats/default/pop3.pcap.out           |  111 +-
 test/results/stats/default/pop3_stls.pcap.out      |  115 +-
 test/results/stats/default/pops.pcapng.out         |  111 +-
 test/results/stats/default/pps.pcap.out            |  139 +-
 test/results/stats/default/pptp.pcap.out           |  103 +-
 test/results/stats/default/protobuf.pcap.out       |  103 +-
 test/results/stats/default/protonvpn.pcap.out      |  115 +-
 test/results/stats/default/psiphon3.pcap.out       |  119 +-
 test/results/stats/default/punycode-idn.pcap.out   |  117 +-
 test/results/stats/default/quic-23.pcap.out        |  103 +-
 test/results/stats/default/quic-24.pcap.out        |  103 +-
 test/results/stats/default/quic-27.pcap.out        |  103 +-
 test/results/stats/default/quic-28.pcap.out        |  103 +-
 test/results/stats/default/quic-29.pcap.out        |  103 +-
 test/results/stats/default/quic-33.pcapng.out      |  115 +-
 test/results/stats/default/quic-34.pcap.out        |  115 +-
 .../default/quic-forcing-vn-with-data.pcapng.out   |  119 +-
 .../stats/default/quic-fuzz-overflow.pcapng.out    |  111 +-
 test/results/stats/default/quic-mvfst-22.pcap.out  |  107 +-
 .../quic-mvfst-22_decryption_error.pcap.out        |  103 +-
 .../results/stats/default/quic-mvfst-27.pcapng.out |  103 +-
 test/results/stats/default/quic-mvfst-exp.pcap.out |  103 +-
 test/results/stats/default/quic-v2.pcapng.out      |  107 +-
 test/results/stats/default/quic.pcap.out           |  111 +-
 test/results/stats/default/quic046.pcap.out        |  103 +-
 test/results/stats/default/quic_0RTT.pcap.out      |  111 +-
 test/results/stats/default/quic_cc_ack.pcapng.out  |  103 +-
 .../default/quic_crypto_aes_auth_size.pcap.out     |  103 +-
 .../quic_frags_ch_in_multiple_packets.pcapng.out   |  123 +-
 ...h_out_of_order_same_packet_craziness.pcapng.out |  125 +-
 .../stats/default/quic_interop_V.pcapng.out        |  119 +-
 test/results/stats/default/quic_q39.pcap.out       |  103 +-
 test/results/stats/default/quic_q43.pcap.out       |  103 +-
 test/results/stats/default/quic_q46.pcap.out       |  103 +-
 test/results/stats/default/quic_q46_b.pcap.out     |  103 +-
 test/results/stats/default/quic_q50.pcap.out       |  103 +-
 test/results/stats/default/quic_t50.pcap.out       |  103 +-
 test/results/stats/default/quic_t51.pcap.out       |  103 +-
 test/results/stats/default/quickplay.pcap.out      |  121 +-
 .../stats/default/radius_false_positive.pcapng.out |  103 +-
 test/results/stats/default/raknet.pcap.out         |  111 +-
 test/results/stats/default/rdp.pcap.out            |  107 +-
 test/results/stats/default/rdp2.pcap.out           |  107 +-
 .../stats/default/reasm_crash_anon.pcapng.out      |  103 +-
 .../stats/default/reasm_segv_anon.pcapng.out       |  103 +-
 test/results/stats/default/reddit.pcap.out         |  119 +-
 test/results/stats/default/riot.pcapng.out         |  115 +-
 test/results/stats/default/riotgames.pcap.out      |  103 +-
 test/results/stats/default/rmcp.pcap.out           |  103 +-
 test/results/stats/default/roblox.pcapng.out       |  107 +-
 .../default/rsh-syslog-false-positive.pcap.out     |  103 +-
 test/results/stats/default/rsh.pcap.out            |  111 +-
 test/results/stats/default/rsync.pcap.out          |  103 +-
 ...tcp_multiple_pkts_in_the_same_datagram.pcap.out |  103 +-
 test/results/stats/default/rtmp.pcap.out           |  103 +-
 test/results/stats/default/rtp.pcapng.out          |  103 +-
 test/results/stats/default/rtsp.pcap.out           |  107 +-
 .../stats/default/rtsp_setup_http.pcapng.out       |  107 +-
 test/results/stats/default/rx.pcap.out             |  103 +-
 test/results/stats/default/s7comm.pcap.out         |  103 +-
 test/results/stats/default/safari.pcap.out         |  111 +-
 test/results/stats/default/salesforce.pcap.out     |  107 +-
 .../stats/default/sccp_hw_conf_register.pcapng.out |  103 +-
 test/results/stats/default/sctp.cap.out            |  103 +-
 test/results/stats/default/selfsigned.pcap.out     |  117 +-
 test/results/stats/default/sflow.pcap.out          |  107 +-
 test/results/stats/default/shadowsocks.pcap.out    |  103 +-
 test/results/stats/default/signal.pcap.out         |  125 +-
 .../results/stats/default/simple-dnscrypt.pcap.out |  111 +-
 test/results/stats/default/sip.pcap.out            |  109 +-
 test/results/stats/default/sip_hello.pcapng.out    |  107 +-
 test/results/stats/default/sites.pcapng.out        |  143 +-
 test/results/stats/default/skinny.pcap.out         |  103 +-
 .../stats/default/skype-conference-call.pcap.out   |  107 +-
 test/results/stats/default/skype.pcap.out          |  137 +-
 .../stats/default/skype_no_unknown.pcap.out        |  139 +-
 test/results/stats/default/skype_udp.pcap.out      |  107 +-
 test/results/stats/default/smb_deletefile.pcap.out |  103 +-
 test/results/stats/default/smb_frags.pcap.out      |  115 +-
 test/results/stats/default/smbv1.pcap.out          |  115 +-
 .../results/stats/default/smpp_in_general.pcap.out |  107 +-
 test/results/stats/default/smtp-starttls.pcap.out  |  123 +-
 test/results/stats/default/smtp.pcap.out           |  103 +-
 test/results/stats/default/smtps.pcapng.out        |  115 +-
 test/results/stats/default/snapchat.pcap.out       |  119 +-
 .../results/stats/default/snapchat_call.pcapng.out |  111 +-
 .../stats/default/snapchat_call_v1.pcapng.out      |  107 +-
 test/results/stats/default/snmp.pcap.out           |  115 +-
 test/results/stats/default/soap.pcap.out           |  107 +-
 test/results/stats/default/socks.pcap.out          |  107 +-
 test/results/stats/default/softether.pcap.out      |  107 +-
 test/results/stats/default/someip-tp.pcap.out      |  107 +-
 .../default/someip-udp-method-call.pcapng.out      |  107 +-
 .../stats/default/someip_sd_sample.pcap.out        |  103 +-
 test/results/stats/default/source_engine.pcap.out  |  107 +-
 test/results/stats/default/sql_injection.pcap.out  |  107 +-
 test/results/stats/default/srvloc-v1.pcapng.out    |  103 +-
 test/results/stats/default/srvloc.pcap.out         |  107 +-
 .../stats/default/ssdp-m-search-ua.pcap.out        |  103 +-
 test/results/stats/default/ssdp-m-search.pcap.out  |  107 +-
 test/results/stats/default/ssh.pcap.out            |  113 +-
 .../stats/default/ssl-cert-name-mismatch.pcap.out  |  107 +-
 .../stats/default/starcraft_battle.pcap.out        |  143 +-
 test/results/stats/default/steam.pcap.out          |  103 +-
 .../default/steam_datagram_relay_ping.pcapng.out   |  103 +-
 test/results/stats/default/stun.pcap.out           |  117 +-
 test/results/stats/default/stun_classic.pcap.out   |  107 +-
 .../stun_dtls_unidirectional_client.pcap.out       |  125 +-
 .../stun_dtls_unidirectional_server.pcap.out       |  119 +-
 .../stats/default/stun_google_meet.pcapng.out      |  111 +-
 .../stats/default/stun_msteams_unidir.pcapng.out   |  107 +-
 test/results/stats/default/stun_signal.pcapng.out  |  117 +-
 .../stun_tcp_multiple_msgs_same_pkt.pcap.out       |  103 +-
 test/results/stats/default/stun_wa_call.pcapng.out |  111 +-
 test/results/stats/default/stun_zoom.pcapng.out    |  123 +-
 test/results/stats/default/syncthing.pcap.out      |  109 +-
 test/results/stats/default/synscan.pcap.out        |  103 +-
 test/results/stats/default/syslog.pcap.out         |  111 +-
 test/results/stats/default/tailscale.pcap.out      |  103 +-
 .../targusdataspeed_false_positives.pcap.out       |  111 +-
 test/results/stats/default/tcp_scan.pcapng.out     |  103 +-
 test/results/stats/default/teams.pcap.out          |  143 +-
 test/results/stats/default/teamspeak3.pcap.out     |  107 +-
 test/results/stats/default/teamviewer.pcap.out     |  115 +-
 test/results/stats/default/telegram.pcap.out       |  133 +-
 .../stats/default/telegram_videocall.pcapng.out    |  113 +-
 test/results/stats/default/telnet.pcap.out         |  111 +-
 test/results/stats/default/teredo.pcap.out         |  103 +-
 test/results/stats/default/tftp.pcap.out           |  107 +-
 test/results/stats/default/threema.pcap.out        |  103 +-
 test/results/stats/default/thrift.pcap.out         |  103 +-
 test/results/stats/default/tinc.pcap.out           |  107 +-
 test/results/stats/default/tk.pcap.out             |  107 +-
 test/results/stats/default/tls-appdata.pcap.out    |  111 +-
 .../results/stats/default/tls-esni-fuzzed.pcap.out |  111 +-
 .../results/stats/default/tls-rdn-extract.pcap.out |  115 +-
 test/results/stats/default/tls_2_reasms.pcapng.out |  107 +-
 .../stats/default/tls_2_reasms_b.pcapng.out        |  107 +-
 test/results/stats/default/tls_alert.pcap.out      |  115 +-
 .../default/tls_certificate_too_long.pcap.out      |  135 +-
 .../results/stats/default/tls_cipher_lens.pcap.out |  107 +-
 ..._certificate_with_missing_server_one.pcapng.out |  123 +-
 test/results/stats/default/tls_ech.pcapng.out      |  107 +-
 .../stats/default/tls_esni_sni_both.pcap.out       |  115 +-
 .../stats/default/tls_false_positives.pcapng.out   |  103 +-
 .../stats/default/tls_invalid_reads.pcap.out       |  111 +-
 test/results/stats/default/tls_long_cert.pcap.out  |  107 +-
 .../stats/default/tls_missing_ch_frag.pcap.out     |  103 +-
 .../tls_multiple_synack_different_seq.pcapng.out   |  107 +-
 test/results/stats/default/tls_port_80.pcapng.out  |  119 +-
 test/results/stats/default/tls_torrent.pcapng.out  |  115 +-
 .../stats/default/tls_unidirectional.pcap.out      |  123 +-
 .../default/tls_verylong_certificate.pcap.out      |  107 +-
 test/results/stats/default/toca-boca.pcap.out      |  107 +-
 test/results/stats/default/tor.pcap.out            |  137 +-
 test/results/stats/default/tplink_shp.pcap.out     |  107 +-
 test/results/stats/default/trickbot.pcap.out       |  119 +-
 test/results/stats/default/tumblr.pcap.out         |  121 +-
 test/results/stats/default/tunnelbear.pcap.out     |  129 +-
 test/results/stats/default/tuya_lp.pcap.out        |  105 +-
 test/results/stats/default/ubntac2.pcap.out        |  107 +-
 test/results/stats/default/ultrasurf.pcap.out      |  119 +-
 test/results/stats/default/upnp.pcap.out           |  103 +-
 test/results/stats/default/viber.pcap.out          |  117 +-
 test/results/stats/default/vk.pcapng.out           |  111 +-
 test/results/stats/default/vnc.pcap.out            |  111 +-
 test/results/stats/default/vrrp3.pcapng.out        |  103 +-
 test/results/stats/default/vxlan.pcap.out          |  103 +-
 test/results/stats/default/wa_video.pcap.out       |  107 +-
 test/results/stats/default/wa_voice.pcap.out       |  121 +-
 test/results/stats/default/waze.pcap.out           |  121 +-
 test/results/stats/default/webex.pcap.out          |  127 +-
 test/results/stats/default/websocket.pcap.out      |  103 +-
 test/results/stats/default/wechat.pcap.out         |  133 +-
 test/results/stats/default/weibo.pcap.out          |  121 +-
 test/results/stats/default/whatsapp.pcap.out       |  107 +-
 .../stats/default/whatsapp_login_call.pcap.out     |  135 +-
 .../stats/default/whatsapp_login_chat.pcap.out     |  119 +-
 .../default/whatsapp_voice_and_message.pcap.out    |  107 +-
 test/results/stats/default/whatsappfiles.pcap.out  |  109 +-
 test/results/stats/default/whois.pcapng.out        |  119 +-
 .../stats/default/windowsupdate_over_http.pcap.out |  115 +-
 test/results/stats/default/wireguard.pcap.out      |  107 +-
 test/results/stats/default/wow.pcap.out            |  115 +-
 test/results/stats/default/xdmcp.pcap.out          |  103 +-
 test/results/stats/default/xiaomi.pcap.out         |  107 +-
 test/results/stats/default/xss.pcap.out            |  107 +-
 test/results/stats/default/yandex.pcapng.out       |  125 +-
 test/results/stats/default/youtube_quic.pcap.out   |  103 +-
 test/results/stats/default/youtubeupload.pcap.out  |  107 +-
 test/results/stats/default/z3950.pcapng.out        |  107 +-
 test/results/stats/default/zabbix.pcap.out         |  103 +-
 test/results/stats/default/zattoo.pcap.out         |  119 +-
 test/results/stats/default/zcash.pcap.out          |  107 +-
 test/results/stats/default/zoom.pcap.out           |  135 +-
 test/results/stats/default/zoom2.pcap.out          |  111 +-
 test/results/stats/default/zoom_p2p.pcapng.out     |  111 +-
 .../stats/disable_aggressiveness/ookla.pcap.out    |  117 +-
 .../disable_protocols/dns_long_domainname.pcap.out |  111 +-
 .../stats/disable_protocols/pluralsight.pcap.out   |  107 +-
 .../disable_protocols/quic-mvfst-27.pcapng.out     |  103 +-
 test/results/stats/disable_protocols/soap.pcap.out |  107 +-
 .../lru_ipv6_caches.pcapng.out                     |  119 +-
 .../stats/enable_doh_heuristic/doh.pcapng.out      |  115 +-
 .../stats/enable_payload_stat/1kxun.pcap.out       |  161 +-
 .../wa_voice.pcap.out                              |  121 +-
 468 files changed, 32596 insertions(+), 20044 deletions(-)
 create mode 100644 examples/c-collectd/www/dpi/risks.html

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 57487d2f0..1ed9b2db5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -360,7 +360,7 @@ target_link_libraries(nDPId-test "${STATIC_LIBNDPI_LIB}" "${pkgcfg_lib_PCAP_pcap
                                  "-pthread")
 
 if(BUILD_EXAMPLES)
-    add_executable(nDPIsrvd-collectd examples/c-collectd/c-collectd.c)
+    add_executable(nDPIsrvd-collectd examples/c-collectd/c-collectd.c utils.c)
     if(BUILD_NDPI)
         add_dependencies(nDPIsrvd-collectd libnDPI)
     endif()
diff --git a/examples/c-collectd/c-collectd.c b/examples/c-collectd/c-collectd.c
index 6bdf59aa3..1878a472e 100644
--- a/examples/c-collectd/c-collectd.c
+++ b/examples/c-collectd/c-collectd.c
@@ -5,7 +5,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <syslog.h>
 #include <sys/epoll.h>
 #include <sys/timerfd.h>
 #include <unistd.h>
@@ -13,198 +12,348 @@
 #include <ndpi_typedefs.h>
 
 #include "nDPIsrvd.h"
+#include "utils.h"
 
 #define DEFAULT_COLLECTD_EXEC_INST "nDPIsrvd"
-#define ERROR_EVENT_ID_MAX 17
-//#define GENERATE_TIMESTAMP 1
-
-#define LOG(flags, format, ...)                                                                                        \
-    if (quiet == 0)                                                                                                    \
+#define MAX_RISKS_PER_FLOW 8
+#define MAX_SEVERITIES_PER_FLOW 4
+#define LOGGER_EARLY(is_error, fmt, ...)                                                                               \
+    do                                                                                                                 \
     {                                                                                                                  \
-        fprintf(stderr, format, __VA_ARGS__);                                                                          \
-        fprintf(stderr, "%s", "\n");                                                                                   \
-    }                                                                                                                  \
-    else                                                                                                               \
-    {                                                                                                                  \
-        syslog(flags, format, __VA_ARGS__);                                                                            \
-    }
+        if (enable_console_logging != 0)                                                                               \
+        {                                                                                                              \
+            logger_early(is_error, fmt, __VA_ARGS__);                                                                  \
+        }                                                                                                              \
+        else                                                                                                           \
+        {                                                                                                              \
+            logger(is_error, fmt, __VA_ARGS__);                                                                        \
+        }                                                                                                              \
+    } while (0)
+//#define GENERATE_TIMESTAMP 1
 
 struct flow_user_data
 {
     nDPIsrvd_ull last_flow_src_l4_payload_len;
     nDPIsrvd_ull last_flow_dst_l4_payload_len;
-    nDPIsrvd_ull detected_risks;
+    uint8_t risks[MAX_RISKS_PER_FLOW];
+    uint8_t severities[MAX_SEVERITIES_PER_FLOW];
+    uint8_t category;
+    uint8_t breed;
+    uint8_t confidence;
+    // "fallthroughs" if we are not in sync with nDPI
+    uint8_t risk_ndpid_invalid : 1;
+    uint8_t category_ndpid_invalid : 1;
+    uint8_t breed_ndpid_invalid : 1;
+    uint8_t confidence_ndpid_invalid : 1;
+    // detection status
+    uint8_t new_seen : 1;
+    uint8_t is_detected : 1;
+    uint8_t is_guessed : 1;
+    uint8_t is_not_detected : 1;
+    // flow state
+    uint8_t is_info : 1;
+    uint8_t is_finished : 1;
+    // Layer3 / Layer4
+    uint8_t is_ip4 : 1;
+    uint8_t is_ip6 : 1;
+    uint8_t is_other_l3 : 1;
+    uint8_t is_tcp : 1;
+    uint8_t is_udp : 1;
+    uint8_t is_icmp : 1;
+    uint8_t is_other_l4 : 1;
 };
 
 static int main_thread_shutdown = 0;
 static int collectd_timerfd = -1;
 static pid_t collectd_pid;
 
+static int enable_console_logging = 0;
 static char * serv_optarg = NULL;
 static char * collectd_hostname = NULL;
 static char * collectd_interval = NULL;
 static char * instance_name = NULL;
 static nDPIsrvd_ull collectd_interval_ull = 0uL;
-static int quiet = 0;
 
 static struct
 {
-    uint64_t json_lines;
-    uint64_t json_bytes;
-
-    uint64_t flow_new_count;
-    uint64_t flow_end_count;
-    uint64_t flow_idle_count;
-    uint64_t flow_update_count;
-    uint64_t flow_analyse_count;
-    uint64_t flow_guessed_count;
-    uint64_t flow_detected_count;
-    uint64_t flow_detection_update_count;
-    uint64_t flow_not_detected_count;
-
-    uint64_t packet_count;
-    uint64_t packet_flow_count;
-
-    uint64_t init_count;
-    uint64_t reconnect_count;
-    uint64_t shutdown_count;
-    uint64_t status_count;
-
-    uint64_t error_count_sum;
-    uint64_t error_count[ERROR_EVENT_ID_MAX];
-    uint64_t error_unknown_count;
-
-    uint64_t flow_src_total_bytes;
-    uint64_t flow_dst_total_bytes;
-    uint64_t flow_risky_count;
-
-    uint64_t flow_breed_safe_count;
-    uint64_t flow_breed_acceptable_count;
-    uint64_t flow_breed_fun_count;
-    uint64_t flow_breed_unsafe_count;
-    uint64_t flow_breed_potentially_dangerous_count;
-    uint64_t flow_breed_tracker_ads_count;
-    uint64_t flow_breed_dangerous_count;
-    uint64_t flow_breed_unrated_count;
-    uint64_t flow_breed_unknown_count;
-
-    uint64_t flow_category_media_count;
-    uint64_t flow_category_vpn_count;
-    uint64_t flow_category_email_count;
-    uint64_t flow_category_data_transfer_count;
-    uint64_t flow_category_web_count;
-    uint64_t flow_category_social_network_count;
-    uint64_t flow_category_download_count;
-    uint64_t flow_category_game_count;
-    uint64_t flow_category_chat_count;
-    uint64_t flow_category_voip_count;
-    uint64_t flow_category_database_count;
-    uint64_t flow_category_remote_access_count;
-    uint64_t flow_category_cloud_count;
-    uint64_t flow_category_network_count;
-    uint64_t flow_category_collaborative_count;
-    uint64_t flow_category_rpc_count;
-    uint64_t flow_category_streaming_count;
-    uint64_t flow_category_system_count;
-    uint64_t flow_category_software_update_count;
-    uint64_t flow_category_music_count;
-    uint64_t flow_category_video_count;
-    uint64_t flow_category_shopping_count;
-    uint64_t flow_category_productivity_count;
-    uint64_t flow_category_file_sharing_count;
-    uint64_t flow_category_mining_count;
-    uint64_t flow_category_malware_count;
-    uint64_t flow_category_advertisment_count;
-    uint64_t flow_category_banned_site_count;
-    uint64_t flow_category_site_unavail_count;
-    uint64_t flow_category_allowed_site_count;
-    uint64_t flow_category_antimalware_count;
-    uint64_t flow_category_crypto_currency_count;
-    uint64_t flow_category_unknown_count;
-
-    uint64_t flow_l3_ip4_count;
-    uint64_t flow_l3_ip6_count;
-    uint64_t flow_l3_other_count;
-
-    uint64_t flow_l4_tcp_count;
-    uint64_t flow_l4_udp_count;
-    uint64_t flow_l4_icmp_count;
-    uint64_t flow_l4_other_count;
-
-    nDPIsrvd_ull flow_risk_count[NDPI_MAX_RISK - 1];
-    nDPIsrvd_ull flow_risk_unknown_count;
+    struct
+    {
+        uint64_t json_lines;
+        uint64_t json_bytes;
+
+        uint64_t flow_new_count;
+        uint64_t flow_end_count;
+        uint64_t flow_idle_count;
+        uint64_t flow_update_count;
+        uint64_t flow_analyse_count;
+        uint64_t flow_guessed_count;
+        uint64_t flow_detected_count;
+        uint64_t flow_detection_update_count;
+        uint64_t flow_not_detected_count;
+
+        uint64_t packet_count;
+        uint64_t packet_flow_count;
+
+        uint64_t init_count;
+        uint64_t reconnect_count;
+        uint64_t shutdown_count;
+        uint64_t status_count;
+
+        uint64_t error_unknown_datalink;
+        uint64_t error_unknown_l3_protocol;
+        uint64_t error_unsupported_datalink;
+        uint64_t error_packet_too_short;
+        uint64_t error_packet_type_unknown;
+        uint64_t error_packet_header_invalid;
+        uint64_t error_ip4_packet_too_short;
+        uint64_t error_ip4_size_smaller_than_header;
+        uint64_t error_ip4_l4_payload_detection;
+        uint64_t error_ip6_packet_too_short;
+        uint64_t error_ip6_size_smaller_than_header;
+        uint64_t error_ip6_l4_payload_detection;
+        uint64_t error_tcp_packet_too_short;
+        uint64_t error_udp_packet_too_short;
+        uint64_t error_capture_size_smaller_than_packet;
+        uint64_t error_max_flows_to_track;
+        uint64_t error_flow_memory_alloc;
+
+        uint64_t flow_src_total_bytes;
+        uint64_t flow_dst_total_bytes;
+        uint64_t flow_risky_count;
+    } counters;
+
+    struct
+    {
+        uint64_t flow_state_info;
+        uint64_t flow_state_finished;
+
+        uint64_t flow_breed_safe_count;
+        uint64_t flow_breed_acceptable_count;
+        uint64_t flow_breed_fun_count;
+        uint64_t flow_breed_unsafe_count;
+        uint64_t flow_breed_potentially_dangerous_count;
+        uint64_t flow_breed_tracker_ads_count;
+        uint64_t flow_breed_dangerous_count;
+        uint64_t flow_breed_unrated_count;
+        uint64_t flow_breed_unknown_count;
+
+        uint64_t flow_category_unspecified_count;
+        uint64_t flow_category_media_count;
+        uint64_t flow_category_vpn_count;
+        uint64_t flow_category_email_count;
+        uint64_t flow_category_data_transfer_count;
+        uint64_t flow_category_web_count;
+        uint64_t flow_category_social_network_count;
+        uint64_t flow_category_download_count;
+        uint64_t flow_category_game_count;
+        uint64_t flow_category_chat_count;
+        uint64_t flow_category_voip_count;
+        uint64_t flow_category_database_count;
+        uint64_t flow_category_remote_access_count;
+        uint64_t flow_category_cloud_count;
+        uint64_t flow_category_network_count;
+        uint64_t flow_category_collaborative_count;
+        uint64_t flow_category_rpc_count;
+        uint64_t flow_category_streaming_count;
+        uint64_t flow_category_system_count;
+        uint64_t flow_category_software_update_count;
+        uint64_t flow_category_music_count;
+        uint64_t flow_category_video_count;
+        uint64_t flow_category_shopping_count;
+        uint64_t flow_category_productivity_count;
+        uint64_t flow_category_file_sharing_count;
+        uint64_t flow_category_conn_check_count;
+        uint64_t flow_category_iot_scada_count;
+        uint64_t flow_category_virt_assistant_count;
+        uint64_t flow_category_cybersecurity_count;
+        uint64_t flow_category_adult_content_count;
+        uint64_t flow_category_mining_count;
+        uint64_t flow_category_malware_count;
+        uint64_t flow_category_advertisment_count;
+        uint64_t flow_category_banned_site_count;
+        uint64_t flow_category_site_unavail_count;
+        uint64_t flow_category_allowed_site_count;
+        uint64_t flow_category_antimalware_count;
+        uint64_t flow_category_crypto_currency_count;
+        uint64_t flow_category_gambling_count;
+        uint64_t flow_category_unknown_count;
+
+        uint64_t flow_confidence_by_port;
+        uint64_t flow_confidence_dpi_partial;
+        uint64_t flow_confidence_dpi_partial_cache;
+        uint64_t flow_confidence_dpi_cache;
+        uint64_t flow_confidence_dpi;
+        uint64_t flow_confidence_nbpf;
+        uint64_t flow_confidence_by_ip;
+        uint64_t flow_confidence_dpi_aggressive;
+        uint64_t flow_confidence_unknown;
+
+        uint64_t flow_severity_low;
+        uint64_t flow_severity_medium;
+        uint64_t flow_severity_high;
+        uint64_t flow_severity_severe;
+        uint64_t flow_severity_critical;
+        uint64_t flow_severity_emergency;
+        uint64_t flow_severity_unknown;
+
+        uint64_t flow_l3_ip4_count;
+        uint64_t flow_l3_ip6_count;
+        uint64_t flow_l3_other_count;
+
+        uint64_t flow_l4_tcp_count;
+        uint64_t flow_l4_udp_count;
+        uint64_t flow_l4_icmp_count;
+        uint64_t flow_l4_other_count;
+
+        uint64_t flow_active_count;
+        uint64_t flow_detected_count;
+        uint64_t flow_guessed_count;
+        uint64_t flow_not_detected_count;
+
+        nDPIsrvd_ull flow_risk_count[NDPI_MAX_RISK - 1];
+        nDPIsrvd_ull flow_risk_unknown_count;
+    } gauges[2];
 } collectd_statistics = {};
 
-struct json_stat_map
+struct global_map
 {
     char const * const json_key;
-    uint64_t * const collectd_stat;
+    struct
+    {
+        uint64_t * const global_stat_inc;
+        uint64_t * const global_stat_dec;
+    };
 };
 
-static struct json_stat_map const flow_event_map[] = {{"new", &collectd_statistics.flow_new_count},
-                                                      {"end", &collectd_statistics.flow_end_count},
-                                                      {"idle", &collectd_statistics.flow_idle_count},
-                                                      {"update", &collectd_statistics.flow_update_count},
-                                                      {"analyse", &collectd_statistics.flow_analyse_count},
-                                                      {"guessed", &collectd_statistics.flow_guessed_count},
-                                                      {"detected", &collectd_statistics.flow_detected_count},
-                                                      {"detection-update",
-                                                       &collectd_statistics.flow_detection_update_count},
-                                                      {"not-detected", &collectd_statistics.flow_not_detected_count}};
-
-static struct json_stat_map const packet_event_map[] = {{"packet", &collectd_statistics.packet_count},
-                                                        {"packet-flow", &collectd_statistics.packet_flow_count}};
-
-static struct json_stat_map const daemon_event_map[] = {{"init", &collectd_statistics.init_count},
-                                                        {"reconnect", &collectd_statistics.reconnect_count},
-                                                        {"shutdown", &collectd_statistics.shutdown_count},
-                                                        {"status", &collectd_statistics.status_count}};
-
-static struct json_stat_map const breeds_map[] = {{"Safe", &collectd_statistics.flow_breed_safe_count},
-                                                  {"Acceptable", &collectd_statistics.flow_breed_acceptable_count},
-                                                  {"Fun", &collectd_statistics.flow_breed_fun_count},
-                                                  {"Unsafe", &collectd_statistics.flow_breed_unsafe_count},
-                                                  {"Potentially Dangerous",
-                                                   &collectd_statistics.flow_breed_potentially_dangerous_count},
-                                                  {"Tracker\\/Ads", &collectd_statistics.flow_breed_tracker_ads_count},
-                                                  {"Dangerous", &collectd_statistics.flow_breed_dangerous_count},
-                                                  {"Unrated", &collectd_statistics.flow_breed_unrated_count},
-                                                  {NULL, &collectd_statistics.flow_breed_unknown_count}};
-
-static struct json_stat_map const categories_map[] = {
-    {"Media", &collectd_statistics.flow_category_media_count},
-    {"VPN", &collectd_statistics.flow_category_vpn_count},
-    {"Email", &collectd_statistics.flow_category_email_count},
-    {"DataTransfer", &collectd_statistics.flow_category_data_transfer_count},
-    {"Web", &collectd_statistics.flow_category_web_count},
-    {"SocialNetwork", &collectd_statistics.flow_category_social_network_count},
-    {"Download-FileTransfer-FileSharing", &collectd_statistics.flow_category_download_count},
-    {"Game", &collectd_statistics.flow_category_game_count},
-    {"Chat", &collectd_statistics.flow_category_chat_count},
-    {"VoIP", &collectd_statistics.flow_category_voip_count},
-    {"Database", &collectd_statistics.flow_category_database_count},
-    {"RemoteAccess", &collectd_statistics.flow_category_remote_access_count},
-    {"Cloud", &collectd_statistics.flow_category_cloud_count},
-    {"Network", &collectd_statistics.flow_category_network_count},
-    {"Collaborative", &collectd_statistics.flow_category_collaborative_count},
-    {"RPC", &collectd_statistics.flow_category_rpc_count},
-    {"Streaming", &collectd_statistics.flow_category_streaming_count},
-    {"System", &collectd_statistics.flow_category_system_count},
-    {"SoftwareUpdate", &collectd_statistics.flow_category_software_update_count},
-    {"Music", &collectd_statistics.flow_category_music_count},
-    {"Video", &collectd_statistics.flow_category_video_count},
-    {"Shopping", &collectd_statistics.flow_category_shopping_count},
-    {"Productivity", &collectd_statistics.flow_category_productivity_count},
-    {"FileSharing", &collectd_statistics.flow_category_file_sharing_count},
-    {"Mining", &collectd_statistics.flow_category_mining_count},
-    {"Malware", &collectd_statistics.flow_category_malware_count},
-    {"Advertisement", &collectd_statistics.flow_category_advertisment_count},
-    {"Banned_Site", &collectd_statistics.flow_category_banned_site_count},
-    {"Site_Unavailable", &collectd_statistics.flow_category_site_unavail_count},
-    {"Allowed_Site", &collectd_statistics.flow_category_allowed_site_count},
-    {"Antimalware", &collectd_statistics.flow_category_antimalware_count},
-    {"Crypto_Currency", &collectd_statistics.flow_category_crypto_currency_count},
-    {NULL, &collectd_statistics.flow_category_unknown_count}};
+#define COLLECTD_STATS_COUNTER_PTR(member)                                                                             \
+    {                                                                                                                  \
+        .global_stat_inc = &(collectd_statistics.counters.member), NULL                                                \
+    }
+#define COLLECTD_STATS_GAUGE_PTR(member)                                                                               \
+    {                                                                                                                  \
+        .global_stat_inc = &(collectd_statistics.gauges[0].member),                                                    \
+        .global_stat_dec = &(collectd_statistics.gauges[1].member)                                                     \
+    }
+#define COLLECTD_STATS_COUNTER_INC(member) (collectd_statistics.counters.member++)
+#define COLLECTD_STATS_GAUGE_RES(member) (collectd_statistics.gauges[0].member--)
+#define COLLECTD_STATS_GAUGE_INC(member) (collectd_statistics.gauges[0].member++)
+#define COLLECTD_STATS_GAUGE_DEC(member) (collectd_statistics.gauges[1].member++)
+#define COLLECTD_STATS_GAUGE_SUB(member) (collectd_statistics.gauges[0].member -= collectd_statistics.gauges[1].member)
+#define COLLECTD_STATS_MAP_NOTNULL(map, index) (map[index - 1].global_stat_dec != NULL)
+#define COLLECTD_STATS_MAP_DEC(map, index) ((*map[index - 1].global_stat_dec)++)
+
+static struct global_map const flow_event_map[] = {{"new", COLLECTD_STATS_COUNTER_PTR(flow_new_count)},
+                                                   {"end", COLLECTD_STATS_COUNTER_PTR(flow_end_count)},
+                                                   {"idle", COLLECTD_STATS_COUNTER_PTR(flow_idle_count)},
+                                                   {"update", COLLECTD_STATS_COUNTER_PTR(flow_update_count)},
+                                                   {"analyse", COLLECTD_STATS_COUNTER_PTR(flow_analyse_count)},
+                                                   {"guessed", COLLECTD_STATS_COUNTER_PTR(flow_guessed_count)},
+                                                   {"detected", COLLECTD_STATS_COUNTER_PTR(flow_detected_count)},
+                                                   {"detection-update",
+                                                    COLLECTD_STATS_COUNTER_PTR(flow_detection_update_count)},
+                                                   {"not-detected",
+                                                    COLLECTD_STATS_COUNTER_PTR(flow_not_detected_count)}};
+
+static struct global_map const packet_event_map[] = {{"packet", COLLECTD_STATS_COUNTER_PTR(packet_count)},
+                                                     {"packet-flow", COLLECTD_STATS_COUNTER_PTR(packet_flow_count)}};
+
+static struct global_map const daemon_event_map[] = {{"init", COLLECTD_STATS_COUNTER_PTR(init_count)},
+                                                     {"reconnect", COLLECTD_STATS_COUNTER_PTR(reconnect_count)},
+                                                     {"shutdown", COLLECTD_STATS_COUNTER_PTR(shutdown_count)},
+                                                     {"status", COLLECTD_STATS_COUNTER_PTR(status_count)}};
+
+static struct global_map const error_event_map[] = {
+    {"Unknown datalink layer packet", COLLECTD_STATS_COUNTER_PTR(error_unknown_datalink)},
+    {"Unknown L3 protocol", COLLECTD_STATS_COUNTER_PTR(error_unknown_l3_protocol)},
+    {"Unsupported datalink layer", COLLECTD_STATS_COUNTER_PTR(error_unsupported_datalink)},
+    {"Packet too short", COLLECTD_STATS_COUNTER_PTR(error_packet_too_short)},
+    {"Unknown packet type", COLLECTD_STATS_COUNTER_PTR(error_packet_type_unknown)},
+    {"Packet header invalid", COLLECTD_STATS_COUNTER_PTR(error_packet_header_invalid)},
+    {"IP4 packet too short", COLLECTD_STATS_COUNTER_PTR(error_ip4_packet_too_short)},
+    {"Packet smaller than IP4 header", COLLECTD_STATS_COUNTER_PTR(error_ip4_size_smaller_than_header)},
+    {"nDPI IPv4\\/L4 payload detection failed", COLLECTD_STATS_COUNTER_PTR(error_ip4_l4_payload_detection)},
+    {"IP6 packet too short", COLLECTD_STATS_COUNTER_PTR(error_ip6_packet_too_short)},
+    {"Packet smaller than IP6 header", COLLECTD_STATS_COUNTER_PTR(error_ip6_size_smaller_than_header)},
+    {"nDPI IPv6\\/L4 payload detection failed", COLLECTD_STATS_COUNTER_PTR(error_ip6_l4_payload_detection)},
+    {"TCP packet smaller than expected", COLLECTD_STATS_COUNTER_PTR(error_tcp_packet_too_short)},
+    {"UDP packet smaller than expected", COLLECTD_STATS_COUNTER_PTR(error_udp_packet_too_short)},
+    {"Captured packet size is smaller than expected packet size",
+     COLLECTD_STATS_COUNTER_PTR(error_capture_size_smaller_than_packet)},
+    {"Max flows to track reached", COLLECTD_STATS_COUNTER_PTR(error_max_flows_to_track)},
+    {"Flow memory allocation failed", COLLECTD_STATS_COUNTER_PTR(error_flow_memory_alloc)}};
+
+static struct global_map const breeds_map[] = {{"Safe", COLLECTD_STATS_GAUGE_PTR(flow_breed_safe_count)},
+                                               {"Acceptable", COLLECTD_STATS_GAUGE_PTR(flow_breed_acceptable_count)},
+                                               {"Fun", COLLECTD_STATS_GAUGE_PTR(flow_breed_fun_count)},
+                                               {"Unsafe", COLLECTD_STATS_GAUGE_PTR(flow_breed_unsafe_count)},
+                                               {"Potentially Dangerous",
+                                                COLLECTD_STATS_GAUGE_PTR(flow_breed_potentially_dangerous_count)},
+                                               {"Tracker\\/Ads",
+                                                COLLECTD_STATS_GAUGE_PTR(flow_breed_tracker_ads_count)},
+                                               {"Dangerous", COLLECTD_STATS_GAUGE_PTR(flow_breed_dangerous_count)},
+                                               {"Unrated", COLLECTD_STATS_GAUGE_PTR(flow_breed_unrated_count)},
+                                               {NULL, COLLECTD_STATS_GAUGE_PTR(flow_breed_unknown_count)}};
+
+static struct global_map const categories_map[] = {
+    {"Unspecified", COLLECTD_STATS_GAUGE_PTR(flow_category_unspecified_count)},
+    {"Media", COLLECTD_STATS_GAUGE_PTR(flow_category_media_count)},
+    {"VPN", COLLECTD_STATS_GAUGE_PTR(flow_category_vpn_count)},
+    {"Email", COLLECTD_STATS_GAUGE_PTR(flow_category_email_count)},
+    {"DataTransfer", COLLECTD_STATS_GAUGE_PTR(flow_category_data_transfer_count)},
+    {"Web", COLLECTD_STATS_GAUGE_PTR(flow_category_web_count)},
+    {"SocialNetwork", COLLECTD_STATS_GAUGE_PTR(flow_category_social_network_count)},
+    {"Download", COLLECTD_STATS_GAUGE_PTR(flow_category_download_count)},
+    {"Game", COLLECTD_STATS_GAUGE_PTR(flow_category_game_count)},
+    {"Chat", COLLECTD_STATS_GAUGE_PTR(flow_category_chat_count)},
+    {"VoIP", COLLECTD_STATS_GAUGE_PTR(flow_category_voip_count)},
+    {"Database", COLLECTD_STATS_GAUGE_PTR(flow_category_database_count)},
+    {"RemoteAccess", COLLECTD_STATS_GAUGE_PTR(flow_category_remote_access_count)},
+    {"Cloud", COLLECTD_STATS_GAUGE_PTR(flow_category_cloud_count)},
+    {"Network", COLLECTD_STATS_GAUGE_PTR(flow_category_network_count)},
+    {"Collaborative", COLLECTD_STATS_GAUGE_PTR(flow_category_collaborative_count)},
+    {"RPC", COLLECTD_STATS_GAUGE_PTR(flow_category_rpc_count)},
+    {"Streaming", COLLECTD_STATS_GAUGE_PTR(flow_category_streaming_count)},
+    {"System", COLLECTD_STATS_GAUGE_PTR(flow_category_system_count)},
+    {"SoftwareUpdate", COLLECTD_STATS_GAUGE_PTR(flow_category_software_update_count)},
+    {"Music", COLLECTD_STATS_GAUGE_PTR(flow_category_music_count)},
+    {"Video", COLLECTD_STATS_GAUGE_PTR(flow_category_video_count)},
+    {"Shopping", COLLECTD_STATS_GAUGE_PTR(flow_category_shopping_count)},
+    {"Productivity", COLLECTD_STATS_GAUGE_PTR(flow_category_productivity_count)},
+    {"FileSharing", COLLECTD_STATS_GAUGE_PTR(flow_category_file_sharing_count)},
+    {"ConnCheck", COLLECTD_STATS_GAUGE_PTR(flow_category_conn_check_count)},
+    {"IoT-Scada", COLLECTD_STATS_GAUGE_PTR(flow_category_iot_scada_count)},
+    {"VirtAssistant", COLLECTD_STATS_GAUGE_PTR(flow_category_virt_assistant_count)},
+    {"Cybersecurity", COLLECTD_STATS_GAUGE_PTR(flow_category_cybersecurity_count)},
+    {"AdultContent", COLLECTD_STATS_GAUGE_PTR(flow_category_adult_content_count)},
+    {"Mining", COLLECTD_STATS_GAUGE_PTR(flow_category_mining_count)},
+    {"Malware", COLLECTD_STATS_GAUGE_PTR(flow_category_malware_count)},
+    {"Advertisement", COLLECTD_STATS_GAUGE_PTR(flow_category_advertisment_count)},
+    {"Banned_Site", COLLECTD_STATS_GAUGE_PTR(flow_category_banned_site_count)},
+    {"Site_Unavailable", COLLECTD_STATS_GAUGE_PTR(flow_category_site_unavail_count)},
+    {"Allowed_Site", COLLECTD_STATS_GAUGE_PTR(flow_category_allowed_site_count)},
+    {"Antimalware", COLLECTD_STATS_GAUGE_PTR(flow_category_antimalware_count)},
+    {"Crypto_Currency", COLLECTD_STATS_GAUGE_PTR(flow_category_crypto_currency_count)},
+    {"Gambling", COLLECTD_STATS_GAUGE_PTR(flow_category_gambling_count)},
+    {NULL, COLLECTD_STATS_GAUGE_PTR(flow_category_unknown_count)}};
+
+static struct global_map const confidence_map[] = {
+    {"Match by port", COLLECTD_STATS_GAUGE_PTR(flow_confidence_by_port)},
+    {"DPI (partial)", COLLECTD_STATS_GAUGE_PTR(flow_confidence_dpi_partial)},
+    {"DPI (partial cache)", COLLECTD_STATS_GAUGE_PTR(flow_confidence_dpi_partial_cache)},
+    {"DPI (cache)", COLLECTD_STATS_GAUGE_PTR(flow_confidence_dpi_cache)},
+    {"DPI", COLLECTD_STATS_GAUGE_PTR(flow_confidence_dpi)},
+    {"nBPF", COLLECTD_STATS_GAUGE_PTR(flow_confidence_nbpf)},
+    {"Match by IP", COLLECTD_STATS_GAUGE_PTR(flow_confidence_by_ip)},
+    {"DPI (aggressive)", COLLECTD_STATS_GAUGE_PTR(flow_confidence_dpi_aggressive)},
+    {NULL, COLLECTD_STATS_GAUGE_PTR(flow_confidence_unknown)}};
+
+static struct global_map const severity_map[] = {{"Low", COLLECTD_STATS_GAUGE_PTR(flow_severity_low)},
+                                                 {"Medium", COLLECTD_STATS_GAUGE_PTR(flow_severity_medium)},
+                                                 {"High", COLLECTD_STATS_GAUGE_PTR(flow_severity_high)},
+                                                 {"Severe", COLLECTD_STATS_GAUGE_PTR(flow_severity_severe)},
+                                                 {"Critical", COLLECTD_STATS_GAUGE_PTR(flow_severity_critical)},
+                                                 {"Emergency", COLLECTD_STATS_GAUGE_PTR(flow_severity_emergency)},
+                                                 {NULL, COLLECTD_STATS_GAUGE_PTR(flow_severity_unknown)}};
 
 #ifdef ENABLE_MEMORY_PROFILING
 void nDPIsrvd_memprof_log_alloc(size_t alloc_size)
@@ -255,11 +404,11 @@ static int create_collectd_timer(void)
 
 static void sighandler(int signum)
 {
-    LOG(LOG_DAEMON | LOG_NOTICE, "Received SIGNAL %d", signum);
+    logger(0, "Received SIGNAL %d", signum);
 
     if (main_thread_shutdown == 0)
     {
-        LOG(LOG_DAEMON | LOG_NOTICE, "%s", "Shutting down ..");
+        logger(0, "%s", "Shutting down ..");
         main_thread_shutdown = 1;
     }
 }
@@ -270,7 +419,8 @@ static int parse_options(int argc, char ** argv, struct nDPIsrvd_socket * const
 
     static char const usage[] =
         "Usage: %s "
-        "[-s host] [-c hostname] [-n collectd-instance-name] [-i interval] [-q]\n\n"
+        "[-l] [-s host] [-c hostname] [-n collectd-instance-name] [-i interval] [-q]\n\n"
+        "\t-l\tLog to console instead of syslog.\n"
         "\t-s\tDestination where nDPIsrvd is listening on.\n"
         "\t-c\tCollectd hostname.\n"
         "\t  \tThis value defaults to the environment variable COLLECTD_HOSTNAME.\n"
@@ -278,14 +428,15 @@ static int parse_options(int argc, char ** argv, struct nDPIsrvd_socket * const
         "\t  \tDefaults to: " DEFAULT_COLLECTD_EXEC_INST
         "\n"
         "\t-i\tInterval between print statistics to stdout.\n"
-        "\t  \tThis value defaults to the environment variable COLLECTD_INTERVAL.\n"
-        "\t-q\tDo not print anything except collectd statistics.\n"
-        "\t  \tAutomatically enabled if environment variables mentioned above are set.\n";
+        "\t  \tThis value defaults to the environment variable COLLECTD_INTERVAL.\n";
 
-    while ((opt = getopt(argc, argv, "hs:c:n:i:q")) != -1)
+    while ((opt = getopt(argc, argv, "hls:c:n:i:")) != -1)
     {
         switch (opt)
         {
+            case 'l':
+                enable_console_logging = 1;
+                break;
             case 's':
                 free(serv_optarg);
                 serv_optarg = strdup(optarg);
@@ -302,11 +453,8 @@ static int parse_options(int argc, char ** argv, struct nDPIsrvd_socket * const
                 free(collectd_interval);
                 collectd_interval = strdup(optarg);
                 break;
-            case 'q':
-                quiet = 1;
-                break;
             default:
-                LOG(LOG_DAEMON | LOG_ERR, usage, argv[0]);
+                fprintf(stderr, usage, argv[0]);
                 return 1;
         }
     }
@@ -323,6 +471,10 @@ static int parse_options(int argc, char ** argv, struct nDPIsrvd_socket * const
         {
             collectd_hostname = strdup("localhost");
         }
+        else
+        {
+            enable_console_logging = 0;
+        }
     }
 
     if (instance_name == NULL)
@@ -337,28 +489,34 @@ static int parse_options(int argc, char ** argv, struct nDPIsrvd_socket * const
         {
             collectd_interval = strdup("60");
         }
+        else
+        {
+            enable_console_logging = 0;
+        }
+    }
+
+    if (enable_console_logging != 0)
+    {
+        enable_console_logger();
     }
 
     if (str_value_to_ull(collectd_interval, &collectd_interval_ull) != CONVERSION_OK)
     {
-        LOG(LOG_DAEMON | LOG_ERR, "Collectd interval `%s' is not a valid number", collectd_interval);
+        LOGGER_EARLY(1, "Collectd interval `%s' is not a valid number", collectd_interval);
         return 1;
     }
 
     if (nDPIsrvd_setup_address(&sock->address, serv_optarg) != 0)
     {
-        LOG(LOG_DAEMON | LOG_ERR, "Could not parse address `%s'", serv_optarg);
+        LOGGER_EARLY(1, "Could not parse address `%s'", serv_optarg);
         return 1;
     }
 
     if (optind < argc)
     {
-        LOG(LOG_DAEMON | LOG_ERR, "%s", "Unexpected argument after options");
-        if (quiet == 0)
-        {
-            LOG(0, "%s", "");
-            LOG(0, usage, argv[0]);
-        }
+        LOGGER_EARLY(1, "%s", "Unexpected argument after options");
+        LOGGER_EARLY(1, "%s", "");
+        LOGGER_EARLY(1, usage, argv[0]);
         return 1;
     }
 
@@ -366,23 +524,45 @@ static int parse_options(int argc, char ** argv, struct nDPIsrvd_socket * const
 }
 
 #ifdef GENERATE_TIMESTAMP
-#define COLLECTD_PUTVAL_PREFIX "PUTVAL \"%s/exec-%s/gauge-"
-#define COLLECTD_PUTVAL_SUFFIX "\" interval=%llu %llu:%llu\n"
-#define COLLECTD_PUTVAL_N(value)                                                                                       \
+#define COLLECTD_COUNTER_PREFIX "PUTVAL \"%s/exec-%s/counter-"
+#define COLLECTD_COUNTER_SUFFIX "\" interval=%llu %llu:%llu\n"
+#define COLLECTD_COUNTER_N(value)                                                                                      \
     collectd_hostname, instance_name, #value, collectd_interval_ull, (unsigned long long int)now,                      \
         (unsigned long long int)collectd_statistics.value
-#define COLLECTD_PUTVAL_N2(name, value)                                                                                \
+#define COLLECTD_COUNTER_N2(name, value)                                                                               \
+    collectd_hostname, instance_name, name, collectd_interval_ull, (unsigned long long int)now,                        \
+        (unsigned long long int)collectd_statistics.value
+
+#define COLLECTD_GAUGE_PREFIX "PUTVAL \"%s/exec-%s/gauge-"
+#define COLLECTD_GAUGE_SUFFIX "\" interval=%llu %llu:%llu\n"
+#define COLLECTD_GAUGE_N(value)                                                                                        \
+    collectd_hostname, instance_name, #value, collectd_interval_ull, (unsigned long long int)now,                      \
+        (unsigned long long int)collectd_statistics.value
+#define COLLECTD_GAUGE_N2(name, value)                                                                                 \
     collectd_hostname, instance_name, name, collectd_interval_ull, (unsigned long long int)now,                        \
         (unsigned long long int)collectd_statistics.value
 #else
-#define COLLECTD_PUTVAL_PREFIX "PUTVAL \"%s/exec-%s/gauge-"
-#define COLLECTD_PUTVAL_SUFFIX "\" interval=%llu N:%llu\n"
-#define COLLECTD_PUTVAL_N(value)                                                                                       \
-    collectd_hostname, instance_name, #value, collectd_interval_ull, (unsigned long long int)collectd_statistics.value
-#define COLLECTD_PUTVAL_N2(name, value)                                                                                \
-    collectd_hostname, instance_name, name, collectd_interval_ull, (unsigned long long int)collectd_statistics.value
+#define COLLECTD_COUNTER_PREFIX "PUTVAL \"%s/exec-%s/counter-"
+#define COLLECTD_COUNTER_SUFFIX "\" interval=%llu N:%llu\n"
+#define COLLECTD_COUNTER_N(value)                                                                                      \
+    collectd_hostname, instance_name, #value, collectd_interval_ull,                                                   \
+        (unsigned long long int)collectd_statistics.counters.value
+#define COLLECTD_COUNTER_N2(name, value)                                                                               \
+    collectd_hostname, instance_name, name, collectd_interval_ull,                                                     \
+        (unsigned long long int)collectd_statistics.counters.value
+
+#define COLLECTD_GAUGE_PREFIX "PUTVAL \"%s/exec-%s/gauge-"
+#define COLLECTD_GAUGE_SUFFIX "\" interval=%llu N:%llu\n"
+#define COLLECTD_GAUGE_N(value)                                                                                        \
+    collectd_hostname, instance_name, #value, collectd_interval_ull,                                                   \
+        (unsigned long long int)collectd_statistics.gauges[0].value
+#define COLLECTD_GAUGE_N2(name, value)                                                                                 \
+    collectd_hostname, instance_name, name, collectd_interval_ull,                                                     \
+        (unsigned long long int)collectd_statistics.gauges[0].value
 #endif
-#define COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_PREFIX "%s" COLLECTD_PUTVAL_SUFFIX
+
+#define COLLECTD_COUNTER_N_FORMAT() COLLECTD_COUNTER_PREFIX "%s" COLLECTD_COUNTER_SUFFIX
+#define COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_PREFIX "%s" COLLECTD_GAUGE_SUFFIX
 static void print_collectd_exec_output(void)
 {
     size_t i;
@@ -390,126 +570,275 @@ static void print_collectd_exec_output(void)
     time_t now = time(NULL);
 #endif
 
-    printf(COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT()
-               COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT()
-                   COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT()
-                       COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT()
-                           COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT()
-                               COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT()
-                                   COLLECTD_PUTVAL_N_FORMAT(),
-
-           COLLECTD_PUTVAL_N(json_lines),
-           COLLECTD_PUTVAL_N(json_bytes),
-           COLLECTD_PUTVAL_N(flow_new_count),
-           COLLECTD_PUTVAL_N(flow_end_count),
-           COLLECTD_PUTVAL_N(flow_idle_count),
-           COLLECTD_PUTVAL_N(flow_update_count),
-           COLLECTD_PUTVAL_N(flow_analyse_count),
-           COLLECTD_PUTVAL_N(flow_guessed_count),
-           COLLECTD_PUTVAL_N(flow_detected_count),
-           COLLECTD_PUTVAL_N(flow_detection_update_count),
-           COLLECTD_PUTVAL_N(flow_not_detected_count),
-           COLLECTD_PUTVAL_N(flow_src_total_bytes),
-           COLLECTD_PUTVAL_N(flow_dst_total_bytes),
-           COLLECTD_PUTVAL_N(flow_risky_count),
-           COLLECTD_PUTVAL_N(packet_count),
-           COLLECTD_PUTVAL_N(packet_flow_count),
-           COLLECTD_PUTVAL_N(init_count),
-           COLLECTD_PUTVAL_N(reconnect_count),
-           COLLECTD_PUTVAL_N(shutdown_count),
-           COLLECTD_PUTVAL_N(status_count));
-
-    printf(COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT()
-               COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT()
-                   COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT(),
-
-           COLLECTD_PUTVAL_N(flow_breed_safe_count),
-           COLLECTD_PUTVAL_N(flow_breed_acceptable_count),
-           COLLECTD_PUTVAL_N(flow_breed_fun_count),
-           COLLECTD_PUTVAL_N(flow_breed_unsafe_count),
-           COLLECTD_PUTVAL_N(flow_breed_potentially_dangerous_count),
-           COLLECTD_PUTVAL_N(flow_breed_tracker_ads_count),
-           COLLECTD_PUTVAL_N(flow_breed_dangerous_count),
-           COLLECTD_PUTVAL_N(flow_breed_unrated_count),
-           COLLECTD_PUTVAL_N(flow_breed_unknown_count));
-
-    printf(COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT()
-               COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT()
-                   COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT()
-                       COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT()
-                           COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT()
-                               COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT()
-                                   COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT()
-                                       COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT()
-                                           COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT()
-                                               COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT()
-                                                   COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT()
-                                                       COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT(),
-
-           COLLECTD_PUTVAL_N(flow_category_media_count),
-           COLLECTD_PUTVAL_N(flow_category_vpn_count),
-           COLLECTD_PUTVAL_N(flow_category_email_count),
-           COLLECTD_PUTVAL_N(flow_category_data_transfer_count),
-           COLLECTD_PUTVAL_N(flow_category_web_count),
-           COLLECTD_PUTVAL_N(flow_category_social_network_count),
-           COLLECTD_PUTVAL_N(flow_category_download_count),
-           COLLECTD_PUTVAL_N(flow_category_game_count),
-           COLLECTD_PUTVAL_N(flow_category_chat_count),
-           COLLECTD_PUTVAL_N(flow_category_voip_count),
-           COLLECTD_PUTVAL_N(flow_category_database_count),
-           COLLECTD_PUTVAL_N(flow_category_remote_access_count),
-           COLLECTD_PUTVAL_N(flow_category_cloud_count),
-           COLLECTD_PUTVAL_N(flow_category_network_count),
-           COLLECTD_PUTVAL_N(flow_category_collaborative_count),
-           COLLECTD_PUTVAL_N(flow_category_rpc_count),
-           COLLECTD_PUTVAL_N(flow_category_streaming_count),
-           COLLECTD_PUTVAL_N(flow_category_system_count),
-           COLLECTD_PUTVAL_N(flow_category_software_update_count),
-           COLLECTD_PUTVAL_N(flow_category_music_count),
-           COLLECTD_PUTVAL_N(flow_category_video_count),
-           COLLECTD_PUTVAL_N(flow_category_shopping_count),
-           COLLECTD_PUTVAL_N(flow_category_productivity_count),
-           COLLECTD_PUTVAL_N(flow_category_file_sharing_count),
-           COLLECTD_PUTVAL_N(flow_category_mining_count),
-           COLLECTD_PUTVAL_N(flow_category_malware_count),
-           COLLECTD_PUTVAL_N(flow_category_advertisment_count),
-           COLLECTD_PUTVAL_N(flow_category_banned_site_count),
-           COLLECTD_PUTVAL_N(flow_category_site_unavail_count),
-           COLLECTD_PUTVAL_N(flow_category_allowed_site_count),
-           COLLECTD_PUTVAL_N(flow_category_antimalware_count),
-           COLLECTD_PUTVAL_N(flow_category_crypto_currency_count),
-           COLLECTD_PUTVAL_N(flow_category_unknown_count));
-
-    printf(COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT()
-               COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT()
-                   COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT() COLLECTD_PUTVAL_N_FORMAT(),
-
-           COLLECTD_PUTVAL_N(flow_l3_ip4_count),
-           COLLECTD_PUTVAL_N(flow_l3_ip6_count),
-           COLLECTD_PUTVAL_N(flow_l3_other_count),
-           COLLECTD_PUTVAL_N(flow_l4_tcp_count),
-           COLLECTD_PUTVAL_N(flow_l4_udp_count),
-           COLLECTD_PUTVAL_N(flow_l4_icmp_count),
-           COLLECTD_PUTVAL_N(flow_l4_other_count),
-           COLLECTD_PUTVAL_N(flow_risk_unknown_count),
-           COLLECTD_PUTVAL_N(error_unknown_count),
-           COLLECTD_PUTVAL_N(error_count_sum));
-
-    for (i = 0; i < ERROR_EVENT_ID_MAX; ++i)
-    {
-        char gauge_name[BUFSIZ];
-        snprintf(gauge_name, sizeof(gauge_name), "error_%zu_count", i);
-        printf(COLLECTD_PUTVAL_N_FORMAT(), COLLECTD_PUTVAL_N2(gauge_name, error_count[i]));
-    }
+    printf(COLLECTD_COUNTER_N_FORMAT() COLLECTD_COUNTER_N_FORMAT() COLLECTD_COUNTER_N_FORMAT()
+               COLLECTD_COUNTER_N_FORMAT() COLLECTD_COUNTER_N_FORMAT() COLLECTD_COUNTER_N_FORMAT()
+                   COLLECTD_COUNTER_N_FORMAT() COLLECTD_COUNTER_N_FORMAT() COLLECTD_COUNTER_N_FORMAT()
+                       COLLECTD_COUNTER_N_FORMAT() COLLECTD_COUNTER_N_FORMAT() COLLECTD_COUNTER_N_FORMAT()
+                           COLLECTD_COUNTER_N_FORMAT() COLLECTD_COUNTER_N_FORMAT() COLLECTD_COUNTER_N_FORMAT()
+                               COLLECTD_COUNTER_N_FORMAT() COLLECTD_COUNTER_N_FORMAT() COLLECTD_COUNTER_N_FORMAT()
+                                   COLLECTD_COUNTER_N_FORMAT() COLLECTD_COUNTER_N_FORMAT() COLLECTD_COUNTER_N_FORMAT()
+                                       COLLECTD_COUNTER_N_FORMAT() COLLECTD_COUNTER_N_FORMAT()
+                                           COLLECTD_COUNTER_N_FORMAT() COLLECTD_COUNTER_N_FORMAT()
+                                               COLLECTD_COUNTER_N_FORMAT() COLLECTD_COUNTER_N_FORMAT()
+                                                   COLLECTD_COUNTER_N_FORMAT() COLLECTD_COUNTER_N_FORMAT()
+                                                       COLLECTD_COUNTER_N_FORMAT() COLLECTD_COUNTER_N_FORMAT()
+                                                           COLLECTD_COUNTER_N_FORMAT() COLLECTD_COUNTER_N_FORMAT()
+                                                               COLLECTD_COUNTER_N_FORMAT() COLLECTD_COUNTER_N_FORMAT()
+                                                                   COLLECTD_COUNTER_N_FORMAT()
+                                                                       COLLECTD_COUNTER_N_FORMAT(),
+
+           COLLECTD_COUNTER_N(json_lines),
+           COLLECTD_COUNTER_N(json_bytes),
+           COLLECTD_COUNTER_N(flow_new_count),
+           COLLECTD_COUNTER_N(flow_end_count),
+           COLLECTD_COUNTER_N(flow_idle_count),
+           COLLECTD_COUNTER_N(flow_update_count),
+           COLLECTD_COUNTER_N(flow_analyse_count),
+           COLLECTD_COUNTER_N(flow_guessed_count),
+           COLLECTD_COUNTER_N(flow_detected_count),
+           COLLECTD_COUNTER_N(flow_detection_update_count),
+           COLLECTD_COUNTER_N(flow_not_detected_count),
+           COLLECTD_COUNTER_N(flow_src_total_bytes),
+           COLLECTD_COUNTER_N(flow_dst_total_bytes),
+           COLLECTD_COUNTER_N(flow_risky_count),
+           COLLECTD_COUNTER_N(packet_count),
+           COLLECTD_COUNTER_N(packet_flow_count),
+           COLLECTD_COUNTER_N(init_count),
+           COLLECTD_COUNTER_N(reconnect_count),
+           COLLECTD_COUNTER_N(shutdown_count),
+           COLLECTD_COUNTER_N(status_count),
+           COLLECTD_COUNTER_N(error_unknown_datalink),
+           COLLECTD_COUNTER_N(error_unknown_l3_protocol),
+           COLLECTD_COUNTER_N(error_unsupported_datalink),
+           COLLECTD_COUNTER_N(error_packet_too_short),
+           COLLECTD_COUNTER_N(error_packet_type_unknown),
+           COLLECTD_COUNTER_N(error_packet_header_invalid),
+           COLLECTD_COUNTER_N(error_ip4_packet_too_short),
+           COLLECTD_COUNTER_N(error_ip4_size_smaller_than_header),
+           COLLECTD_COUNTER_N(error_ip4_l4_payload_detection),
+           COLLECTD_COUNTER_N(error_ip6_packet_too_short),
+           COLLECTD_COUNTER_N(error_ip6_size_smaller_than_header),
+           COLLECTD_COUNTER_N(error_ip6_l4_payload_detection),
+           COLLECTD_COUNTER_N(error_tcp_packet_too_short),
+           COLLECTD_COUNTER_N(error_udp_packet_too_short),
+           COLLECTD_COUNTER_N(error_capture_size_smaller_than_packet),
+           COLLECTD_COUNTER_N(error_max_flows_to_track),
+           COLLECTD_COUNTER_N(error_flow_memory_alloc));
+
+    printf(COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT()
+               COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT()
+                   COLLECTD_GAUGE_N_FORMAT(),
+
+           COLLECTD_GAUGE_N(flow_breed_safe_count),
+           COLLECTD_GAUGE_N(flow_breed_acceptable_count),
+           COLLECTD_GAUGE_N(flow_breed_fun_count),
+           COLLECTD_GAUGE_N(flow_breed_unsafe_count),
+           COLLECTD_GAUGE_N(flow_breed_potentially_dangerous_count),
+           COLLECTD_GAUGE_N(flow_breed_tracker_ads_count),
+           COLLECTD_GAUGE_N(flow_breed_dangerous_count),
+           COLLECTD_GAUGE_N(flow_breed_unrated_count),
+           COLLECTD_GAUGE_N(flow_breed_unknown_count));
+
+    printf(COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT()
+               COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT()
+                   COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT()
+                       COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT()
+                           COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT()
+                               COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT()
+                                   COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT()
+                                       COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT()
+                                           COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT()
+                                               COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT()
+                                                   COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT()
+                                                       COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT()
+                                                           COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT()
+                                                               COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT()
+                                                                   COLLECTD_GAUGE_N_FORMAT(),
+
+           COLLECTD_GAUGE_N(flow_category_unspecified_count),
+           COLLECTD_GAUGE_N(flow_category_media_count),
+           COLLECTD_GAUGE_N(flow_category_vpn_count),
+           COLLECTD_GAUGE_N(flow_category_email_count),
+           COLLECTD_GAUGE_N(flow_category_data_transfer_count),
+           COLLECTD_GAUGE_N(flow_category_web_count),
+           COLLECTD_GAUGE_N(flow_category_social_network_count),
+           COLLECTD_GAUGE_N(flow_category_download_count),
+           COLLECTD_GAUGE_N(flow_category_game_count),
+           COLLECTD_GAUGE_N(flow_category_chat_count),
+           COLLECTD_GAUGE_N(flow_category_voip_count),
+           COLLECTD_GAUGE_N(flow_category_database_count),
+           COLLECTD_GAUGE_N(flow_category_remote_access_count),
+           COLLECTD_GAUGE_N(flow_category_cloud_count),
+           COLLECTD_GAUGE_N(flow_category_network_count),
+           COLLECTD_GAUGE_N(flow_category_collaborative_count),
+           COLLECTD_GAUGE_N(flow_category_rpc_count),
+           COLLECTD_GAUGE_N(flow_category_streaming_count),
+           COLLECTD_GAUGE_N(flow_category_system_count),
+           COLLECTD_GAUGE_N(flow_category_software_update_count),
+           COLLECTD_GAUGE_N(flow_category_music_count),
+           COLLECTD_GAUGE_N(flow_category_video_count),
+           COLLECTD_GAUGE_N(flow_category_shopping_count),
+           COLLECTD_GAUGE_N(flow_category_productivity_count),
+           COLLECTD_GAUGE_N(flow_category_file_sharing_count),
+           COLLECTD_GAUGE_N(flow_category_conn_check_count),
+           COLLECTD_GAUGE_N(flow_category_iot_scada_count),
+           COLLECTD_GAUGE_N(flow_category_virt_assistant_count),
+           COLLECTD_GAUGE_N(flow_category_cybersecurity_count),
+           COLLECTD_GAUGE_N(flow_category_adult_content_count),
+           COLLECTD_GAUGE_N(flow_category_mining_count),
+           COLLECTD_GAUGE_N(flow_category_malware_count),
+           COLLECTD_GAUGE_N(flow_category_advertisment_count),
+           COLLECTD_GAUGE_N(flow_category_banned_site_count),
+           COLLECTD_GAUGE_N(flow_category_site_unavail_count),
+           COLLECTD_GAUGE_N(flow_category_allowed_site_count),
+           COLLECTD_GAUGE_N(flow_category_antimalware_count),
+           COLLECTD_GAUGE_N(flow_category_crypto_currency_count),
+           COLLECTD_GAUGE_N(flow_category_gambling_count),
+           COLLECTD_GAUGE_N(flow_category_unknown_count));
+
+    printf(COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT()
+               COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT()
+                   COLLECTD_GAUGE_N_FORMAT(),
+
+           COLLECTD_GAUGE_N(flow_confidence_by_port),
+           COLLECTD_GAUGE_N(flow_confidence_dpi_partial),
+           COLLECTD_GAUGE_N(flow_confidence_dpi_partial_cache),
+           COLLECTD_GAUGE_N(flow_confidence_dpi_cache),
+           COLLECTD_GAUGE_N(flow_confidence_dpi),
+           COLLECTD_GAUGE_N(flow_confidence_nbpf),
+           COLLECTD_GAUGE_N(flow_confidence_by_ip),
+           COLLECTD_GAUGE_N(flow_confidence_dpi_aggressive),
+           COLLECTD_GAUGE_N(flow_confidence_unknown));
+
+    printf(COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT()
+               COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT(),
+
+           COLLECTD_GAUGE_N(flow_severity_low),
+           COLLECTD_GAUGE_N(flow_severity_medium),
+           COLLECTD_GAUGE_N(flow_severity_high),
+           COLLECTD_GAUGE_N(flow_severity_severe),
+           COLLECTD_GAUGE_N(flow_severity_critical),
+           COLLECTD_GAUGE_N(flow_severity_emergency),
+           COLLECTD_GAUGE_N(flow_severity_unknown));
+
+    printf(COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT()
+               COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT(),
+
+           COLLECTD_GAUGE_N(flow_l3_ip4_count),
+           COLLECTD_GAUGE_N(flow_l3_ip6_count),
+           COLLECTD_GAUGE_N(flow_l3_other_count),
+           COLLECTD_GAUGE_N(flow_l4_tcp_count),
+           COLLECTD_GAUGE_N(flow_l4_udp_count),
+           COLLECTD_GAUGE_N(flow_l4_icmp_count),
+           COLLECTD_GAUGE_N(flow_l4_other_count),
+           COLLECTD_GAUGE_N(flow_risk_unknown_count));
+
+    printf(COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT() COLLECTD_GAUGE_N_FORMAT(),
+           COLLECTD_GAUGE_N(flow_active_count),
+           COLLECTD_GAUGE_N(flow_detected_count),
+           COLLECTD_GAUGE_N(flow_guessed_count),
+           COLLECTD_GAUGE_N(flow_not_detected_count));
 
     for (i = 0; i < NDPI_MAX_RISK - 1; ++i)
     {
         char gauge_name[BUFSIZ];
         snprintf(gauge_name, sizeof(gauge_name), "flow_risk_%zu_count", i + 1);
-        printf(COLLECTD_PUTVAL_N_FORMAT(), COLLECTD_PUTVAL_N2(gauge_name, flow_risk_count[i]));
+        printf(COLLECTD_GAUGE_N_FORMAT(), COLLECTD_GAUGE_N2(gauge_name, flow_risk_count[i]));
+    }
+
+    COLLECTD_STATS_GAUGE_SUB(flow_state_info);
+    COLLECTD_STATS_GAUGE_SUB(flow_state_finished);
+
+    COLLECTD_STATS_GAUGE_SUB(flow_breed_safe_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_breed_acceptable_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_breed_fun_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_breed_unsafe_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_breed_potentially_dangerous_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_breed_tracker_ads_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_breed_dangerous_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_breed_unrated_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_breed_unknown_count);
+
+    COLLECTD_STATS_GAUGE_SUB(flow_category_unspecified_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_media_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_vpn_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_email_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_data_transfer_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_web_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_social_network_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_download_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_game_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_chat_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_voip_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_database_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_remote_access_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_cloud_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_network_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_collaborative_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_rpc_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_streaming_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_system_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_software_update_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_music_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_video_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_shopping_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_productivity_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_file_sharing_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_conn_check_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_iot_scada_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_virt_assistant_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_cybersecurity_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_adult_content_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_mining_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_malware_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_advertisment_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_banned_site_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_site_unavail_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_allowed_site_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_antimalware_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_crypto_currency_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_gambling_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_category_unknown_count);
+
+    COLLECTD_STATS_GAUGE_SUB(flow_confidence_by_port);
+    COLLECTD_STATS_GAUGE_SUB(flow_confidence_dpi_partial);
+    COLLECTD_STATS_GAUGE_SUB(flow_confidence_dpi_partial_cache);
+    COLLECTD_STATS_GAUGE_SUB(flow_confidence_dpi_cache);
+    COLLECTD_STATS_GAUGE_SUB(flow_confidence_dpi);
+    COLLECTD_STATS_GAUGE_SUB(flow_confidence_nbpf);
+    COLLECTD_STATS_GAUGE_SUB(flow_confidence_by_ip);
+    COLLECTD_STATS_GAUGE_SUB(flow_confidence_dpi_aggressive);
+    COLLECTD_STATS_GAUGE_SUB(flow_confidence_unknown);
+
+    COLLECTD_STATS_GAUGE_SUB(flow_severity_low);
+    COLLECTD_STATS_GAUGE_SUB(flow_severity_medium);
+    COLLECTD_STATS_GAUGE_SUB(flow_severity_high);
+    COLLECTD_STATS_GAUGE_SUB(flow_severity_severe);
+    COLLECTD_STATS_GAUGE_SUB(flow_severity_critical);
+    COLLECTD_STATS_GAUGE_SUB(flow_severity_emergency);
+    COLLECTD_STATS_GAUGE_SUB(flow_severity_unknown);
+
+    COLLECTD_STATS_GAUGE_SUB(flow_l3_ip4_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_l3_ip6_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_l3_other_count);
+
+    COLLECTD_STATS_GAUGE_SUB(flow_l4_tcp_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_l4_udp_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_l4_icmp_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_l4_other_count);
+
+    COLLECTD_STATS_GAUGE_SUB(flow_active_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_detected_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_guessed_count);
+    COLLECTD_STATS_GAUGE_SUB(flow_not_detected_count);
+
+    for (size_t i = 0; i < NDPI_MAX_RISK - 1; ++i)
+    {
+        COLLECTD_STATS_GAUGE_SUB(flow_risk_count[i]);
     }
+    COLLECTD_STATS_GAUGE_SUB(flow_risk_unknown_count);
 
-    memset(&collectd_statistics, 0, sizeof(collectd_statistics));
+    memset(&collectd_statistics.gauges[1], 0, sizeof(collectd_statistics.gauges[1]));
 }
 
 static int mainloop(int epollfd, struct nDPIsrvd_socket * const sock)
@@ -525,7 +854,7 @@ static int mainloop(int epollfd, struct nDPIsrvd_socket * const sock)
         {
             if (events[i].events & EPOLLERR)
             {
-                LOG(LOG_DAEMON | LOG_ERR, "Epoll event error: %s", (errno != 0 ? strerror(errno) : "EPOLLERR"));
+                logger(1, "Epoll event error: %s", (errno != 0 ? strerror(errno) : "EPOLLERR"));
                 break;
             }
 
@@ -539,19 +868,19 @@ static int mainloop(int epollfd, struct nDPIsrvd_socket * const sock)
                  */
                 if (getppid() != collectd_pid)
                 {
-                    LOG(LOG_DAEMON | LOG_ERR, "Parent process %d exited. Nothing left to do here, bye.", collectd_pid);
+                    logger(1, "Parent process %d exited. Nothing left to do here, bye.", collectd_pid);
                     return 1;
                 }
 
                 errno = 0;
                 if (read(collectd_timerfd, &expirations, sizeof(expirations)) != sizeof(expirations))
                 {
-                    LOG(LOG_DAEMON | LOG_ERR, "Could not read timer expirations: %s", strerror(errno));
+                    logger(1, "Could not read timer expirations: %s", strerror(errno));
                     return 1;
                 }
                 if (set_collectd_timer() != 0)
                 {
-                    LOG(LOG_DAEMON | LOG_ERR, "Could not set timer: %s", strerror(errno));
+                    logger(1, "Could not set timer: %s", strerror(errno));
                     return 1;
                 }
 
@@ -563,14 +892,14 @@ static int mainloop(int epollfd, struct nDPIsrvd_socket * const sock)
                 enum nDPIsrvd_read_return read_ret = nDPIsrvd_read(sock);
                 if (read_ret != READ_OK)
                 {
-                    LOG(LOG_DAEMON | LOG_ERR, "nDPIsrvd read failed with: %s", nDPIsrvd_enum_to_string(read_ret));
+                    logger(1, "nDPIsrvd read failed with: %s", nDPIsrvd_enum_to_string(read_ret));
                     return 1;
                 }
 
                 enum nDPIsrvd_parse_return parse_ret = nDPIsrvd_parse_all(sock);
                 if (parse_ret != PARSE_NEED_MORE_DATA)
                 {
-                    LOG(LOG_DAEMON | LOG_ERR, "nDPIsrvd parse failed with: %s", nDPIsrvd_enum_to_string(parse_ret));
+                    logger(1, "nDPIsrvd parse failed with: %s", nDPIsrvd_enum_to_string(parse_ret));
                     return 1;
                 }
             }
@@ -580,186 +909,570 @@ static int mainloop(int epollfd, struct nDPIsrvd_socket * const sock)
     return 0;
 }
 
-static void collectd_map_token_to_stat(struct nDPIsrvd_socket * const sock,
-                                       struct nDPIsrvd_json_token const * const token,
-                                       struct json_stat_map const * const map,
-                                       size_t map_length)
+static int collectd_map_to_stat(char const * const token_str,
+                                size_t token_length,
+                                struct global_map const * const map,
+                                size_t map_length)
 {
     size_t i, null_i = map_length;
 
-    if (token == NULL)
-    {
-        return;
-    }
-
     for (i = 0; i < map_length; ++i)
     {
         if (map[i].json_key == NULL)
         {
             null_i = i;
-            continue;
+            break;
         }
 
-        if (TOKEN_VALUE_EQUALS(sock, token, map[i].json_key, strlen(map[i].json_key)) != 0)
+        size_t key_length = strlen(map[i].json_key);
+        if (key_length == token_length && strncmp(map[i].json_key, token_str, token_length) == 0)
         {
-            (*map[i].collectd_stat)++;
-            return;
+            (*map[i].global_stat_inc)++;
+            return 0;
         }
     }
 
-    if (null_i < map_length)
+    if (null_i < map_length && map[null_i].global_stat_inc != NULL)
     {
-        (*map[null_i].collectd_stat)++;
+        (*map[null_i].global_stat_inc)++;
+        return 0;
     }
+
+    return 1;
 }
 
-static enum nDPIsrvd_callback_return collectd_json_callback(struct nDPIsrvd_socket * const sock,
-                                                            struct nDPIsrvd_instance * const instance,
-                                                            struct nDPIsrvd_thread_data * const thread_data,
-                                                            struct nDPIsrvd_flow * const flow)
+static int collectd_map_value_to_stat(struct nDPIsrvd_socket * const sock,
+                                      struct nDPIsrvd_json_token const * const token,
+                                      struct global_map const * const map,
+                                      size_t map_length)
 {
-    (void)instance;
-    (void)thread_data;
+    char const * value_str = NULL;
+    size_t value_length = 0;
 
-    struct nDPIsrvd_json_token const * const flow_event_name = TOKEN_GET_SZ(sock, "flow_event_name");
-    struct flow_user_data * flow_user_data = NULL;
+    value_str = TOKEN_GET_VALUE(sock, token, &value_length);
+    if (value_length == 0 || value_str == NULL)
+    {
+        return 1;
+    }
 
-    collectd_statistics.json_lines++;
-    collectd_statistics.json_bytes += sock->buffer.json_message_length + NETWORK_BUFFER_LENGTH_DIGITS;
+    return collectd_map_to_stat(value_str, value_length, map, map_length);
+}
 
-    struct nDPIsrvd_json_token const * const packet_event_name = TOKEN_GET_SZ(sock, "packet_event_name");
-    if (packet_event_name != NULL)
+static void collectd_unmap_flow_from_stat(struct flow_user_data * const flow_user_data)
+{
+    if (flow_user_data->is_ip4 != 0)
     {
-        collectd_map_token_to_stat(sock, packet_event_name, packet_event_map, nDPIsrvd_ARRAY_LENGTH(packet_event_map));
+        COLLECTD_STATS_GAUGE_DEC(flow_l3_ip4_count);
     }
 
-    struct nDPIsrvd_json_token const * const daemon_event_name = TOKEN_GET_SZ(sock, "daemon_event_name");
-    if (daemon_event_name != NULL)
+    if (flow_user_data->is_ip6 != 0)
     {
-        collectd_map_token_to_stat(sock, daemon_event_name, daemon_event_map, nDPIsrvd_ARRAY_LENGTH(daemon_event_map));
+        COLLECTD_STATS_GAUGE_DEC(flow_l3_ip6_count);
     }
 
-    struct nDPIsrvd_json_token const * const error_event_id = TOKEN_GET_SZ(sock, "error_event_id");
-    if (error_event_id != NULL)
+    if (flow_user_data->is_other_l3 != 0)
     {
-        nDPIsrvd_ull error_event_id_ull;
-        if (TOKEN_VALUE_TO_ULL(sock, error_event_id, &error_event_id_ull) != CONVERSION_OK)
-        {
-            return CALLBACK_ERROR;
-        }
+        COLLECTD_STATS_GAUGE_DEC(flow_l3_other_count);
+    }
+
+    if (flow_user_data->is_tcp != 0)
+    {
+        COLLECTD_STATS_GAUGE_DEC(flow_l4_tcp_count);
+    }
 
-        collectd_statistics.error_count_sum++;
-        if (error_event_id_ull < ERROR_EVENT_ID_MAX)
+    if (flow_user_data->is_udp != 0)
+    {
+        COLLECTD_STATS_GAUGE_DEC(flow_l4_udp_count);
+    }
+
+    if (flow_user_data->is_icmp != 0)
+    {
+        COLLECTD_STATS_GAUGE_DEC(flow_l4_icmp_count);
+    }
+
+    if (flow_user_data->is_other_l4 != 0)
+    {
+        COLLECTD_STATS_GAUGE_DEC(flow_l4_other_count);
+    }
+
+    if (flow_user_data->new_seen != 0)
+    {
+        COLLECTD_STATS_GAUGE_DEC(flow_active_count);
+    }
+
+    if (flow_user_data->is_detected != 0)
+    {
+        COLLECTD_STATS_GAUGE_DEC(flow_detected_count);
+    }
+
+    if (flow_user_data->is_guessed != 0)
+    {
+        COLLECTD_STATS_GAUGE_DEC(flow_guessed_count);
+    }
+
+    if (flow_user_data->is_not_detected != 0)
+    {
+        COLLECTD_STATS_GAUGE_DEC(flow_not_detected_count);
+    }
+
+    if (flow_user_data->is_info != 0)
+    {
+        COLLECTD_STATS_GAUGE_DEC(flow_state_info);
+    }
+
+    if (flow_user_data->is_finished != 0)
+    {
+        COLLECTD_STATS_GAUGE_DEC(flow_state_finished);
+    }
+
+    if (flow_user_data->breed > 0 && flow_user_data->breed_ndpid_invalid == 0 &&
+        COLLECTD_STATS_MAP_NOTNULL(breeds_map, flow_user_data->breed) != 0)
+    {
+        COLLECTD_STATS_MAP_DEC(breeds_map, flow_user_data->breed);
+    }
+
+    if (flow_user_data->category > 0 && flow_user_data->category_ndpid_invalid == 0 &&
+        COLLECTD_STATS_MAP_NOTNULL(categories_map, flow_user_data->category) != 0)
+    {
+        COLLECTD_STATS_MAP_DEC(categories_map, flow_user_data->category);
+    }
+
+    if (flow_user_data->confidence > 0 && flow_user_data->confidence_ndpid_invalid == 0 &&
+        COLLECTD_STATS_MAP_NOTNULL(confidence_map, flow_user_data->confidence) != 0)
+    {
+        COLLECTD_STATS_MAP_DEC(confidence_map, flow_user_data->confidence);
+    }
+
+    for (uint8_t i = 0; i < MAX_SEVERITIES_PER_FLOW; ++i)
+    {
+        if (flow_user_data->severities[i] > 0)
         {
-            collectd_statistics.error_count[error_event_id_ull]++;
+            COLLECTD_STATS_MAP_DEC(severity_map, flow_user_data->severities[i]);
         }
-        else
+    }
+
+    for (uint8_t i = 0; i < MAX_RISKS_PER_FLOW; ++i)
+    {
+        if (flow_user_data->risks[i] > 0)
         {
-            collectd_statistics.error_unknown_count++;
+            COLLECTD_STATS_GAUGE_DEC(flow_risk_count[flow_user_data->risks[i]]);
         }
     }
 
-    if (flow != NULL)
+    if (flow_user_data->risk_ndpid_invalid != 0)
     {
-        flow_user_data = (struct flow_user_data *)flow->flow_user_data;
+        COLLECTD_STATS_GAUGE_DEC(flow_risk_unknown_count);
     }
+}
 
-    if (flow_user_data != NULL)
+static ssize_t collectd_map_index(char const * const json_key,
+                                  size_t key_length,
+                                  struct global_map const * const map,
+                                  size_t map_length)
+{
+    if (json_key == NULL || key_length == 0)
     {
-        nDPIsrvd_ull total_bytes_ull[2] = {0, 0};
+        return -1;
+    }
 
-        if (TOKEN_VALUE_TO_ULL(sock, TOKEN_GET_SZ(sock, "flow_src_tot_l4_payload_len"), &total_bytes_ull[0]) ==
-                CONVERSION_OK &&
-            TOKEN_VALUE_TO_ULL(sock, TOKEN_GET_SZ(sock, "flow_dst_tot_l4_payload_len"), &total_bytes_ull[1]) ==
-                CONVERSION_OK)
+    for (size_t i = 0; i < map_length; ++i)
+    {
+        if (map[i].json_key == NULL)
         {
-            collectd_statistics.flow_src_total_bytes +=
-                total_bytes_ull[0] - flow_user_data->last_flow_src_l4_payload_len;
-            collectd_statistics.flow_dst_total_bytes +=
-                total_bytes_ull[1] - flow_user_data->last_flow_dst_l4_payload_len;
+            continue;
+        }
 
-            flow_user_data->last_flow_src_l4_payload_len = total_bytes_ull[0];
-            flow_user_data->last_flow_dst_l4_payload_len = total_bytes_ull[1];
+        if (key_length == strlen(map[i].json_key) && strncmp(json_key, map[i].json_key, key_length) == 0)
+        {
+            return i;
         }
     }
 
-    collectd_map_token_to_stat(sock, flow_event_name, flow_event_map, nDPIsrvd_ARRAY_LENGTH(flow_event_map));
+    return -1;
+}
+
+static int collectd_map_flow_u8(struct nDPIsrvd_socket * const sock,
+                                struct nDPIsrvd_json_token const * const token,
+                                struct global_map const * const map,
+                                size_t map_length,
+                                uint8_t * const dest)
+{
+    if (token == NULL || dest == NULL)
+    {
+        return 1;
+    }
+
+    size_t len;
+    char const * const str = TOKEN_GET_VALUE(sock, token, &len);
+    if (str == NULL || len == 0)
+    {
+        return 1;
+    }
+
+    ssize_t const map_index = collectd_map_index(str, len, map, map_length);
+    if (map_index < 0 || map_index > UCHAR_MAX)
+    {
+        return 1;
+    }
+
+    *dest = map_index + 1;
+    return 0;
+}
+
+static void process_flow_stats(struct nDPIsrvd_socket * const sock, struct nDPIsrvd_flow * const flow)
+{
+    struct flow_user_data * flow_user_data;
+    struct nDPIsrvd_json_token const * const flow_event_name = TOKEN_GET_SZ(sock, "flow_event_name");
+    struct nDPIsrvd_json_token const * const flow_state = TOKEN_GET_SZ(sock, "flow_state");
+    nDPIsrvd_ull total_bytes_ull[2];
+
+    if (flow == NULL)
+    {
+        return;
+    }
+    flow_user_data = (struct flow_user_data *)flow->flow_user_data;
+    if (flow_user_data == NULL)
+    {
+        return;
+    }
+
     if (TOKEN_VALUE_EQUALS_SZ(sock, flow_event_name, "new") != 0)
     {
+        flow_user_data->new_seen = 1;
+        COLLECTD_STATS_GAUGE_INC(flow_active_count);
+
         struct nDPIsrvd_json_token const * const l3_proto = TOKEN_GET_SZ(sock, "l3_proto");
         if (TOKEN_VALUE_EQUALS_SZ(sock, l3_proto, "ip4") != 0)
         {
-            collectd_statistics.flow_l3_ip4_count++;
+            flow_user_data->is_ip4 = 1;
+            COLLECTD_STATS_GAUGE_INC(flow_l3_ip4_count);
         }
         else if (TOKEN_VALUE_EQUALS_SZ(sock, l3_proto, "ip6") != 0)
         {
-            collectd_statistics.flow_l3_ip6_count++;
+            flow_user_data->is_ip6 = 1;
+            COLLECTD_STATS_GAUGE_INC(flow_l3_ip6_count);
         }
         else if (l3_proto != NULL)
         {
-            collectd_statistics.flow_l3_other_count++;
+            flow_user_data->is_other_l3 = 1;
+            COLLECTD_STATS_GAUGE_INC(flow_l3_other_count);
         }
 
         struct nDPIsrvd_json_token const * const l4_proto = TOKEN_GET_SZ(sock, "l4_proto");
         if (TOKEN_VALUE_EQUALS_SZ(sock, l4_proto, "tcp") != 0)
         {
-            collectd_statistics.flow_l4_tcp_count++;
+            flow_user_data->is_tcp = 1;
+            COLLECTD_STATS_GAUGE_INC(flow_l4_tcp_count);
         }
         else if (TOKEN_VALUE_EQUALS_SZ(sock, l4_proto, "udp") != 0)
         {
-            collectd_statistics.flow_l4_udp_count++;
+            flow_user_data->is_udp = 1;
+            COLLECTD_STATS_GAUGE_INC(flow_l4_udp_count);
         }
         else if (TOKEN_VALUE_EQUALS_SZ(sock, l4_proto, "icmp") != 0)
         {
-            collectd_statistics.flow_l4_icmp_count++;
+            flow_user_data->is_icmp = 1;
+            COLLECTD_STATS_GAUGE_INC(flow_l4_icmp_count);
         }
         else if (l4_proto != NULL)
         {
-            collectd_statistics.flow_l4_other_count++;
+            flow_user_data->is_other_l4 = 1;
+            COLLECTD_STATS_GAUGE_INC(flow_l4_other_count);
         }
     }
+    else if (flow_user_data->new_seen == 0)
+    {
+        return;
+    }
+
+    if (TOKEN_VALUE_EQUALS_SZ(sock, flow_event_name, "not-detected") != 0)
+    {
+        flow_user_data->is_not_detected = 1;
+        COLLECTD_STATS_GAUGE_INC(flow_not_detected_count);
+    }
+    else if (TOKEN_VALUE_EQUALS_SZ(sock, flow_event_name, "guessed") != 0)
+    {
+        flow_user_data->is_guessed = 1;
+        COLLECTD_STATS_GAUGE_INC(flow_guessed_count);
+    }
     else if (TOKEN_VALUE_EQUALS_SZ(sock, flow_event_name, "detected") != 0 ||
-             TOKEN_VALUE_EQUALS_SZ(sock, flow_event_name, "detection-update") != 0 ||
-             TOKEN_VALUE_EQUALS_SZ(sock, flow_event_name, "update") != 0)
+             TOKEN_VALUE_EQUALS_SZ(sock, flow_event_name, "detection-update") != 0)
     {
         struct nDPIsrvd_json_token const * const flow_risk = TOKEN_GET_SZ(sock, "ndpi", "flow_risk");
         struct nDPIsrvd_json_token const * current = NULL;
         int next_child_index = -1;
 
-        if (flow_risk != NULL && flow_user_data != NULL)
+        if (flow_user_data->is_detected == 0)
         {
-            if (flow_user_data->detected_risks == 0)
+            flow_user_data->is_detected = 1;
+            COLLECTD_STATS_GAUGE_INC(flow_detected_count);
+        }
+
+        if (flow_risk != NULL)
+        {
+            if (flow_user_data->risks[0] == 0)
             {
-                collectd_statistics.flow_risky_count++;
+                COLLECTD_STATS_COUNTER_INC(flow_risky_count);
             }
 
             while ((current = nDPIsrvd_get_next_token(sock, flow_risk, &next_child_index)) != NULL)
             {
+                size_t numeric_risk_len = 0;
+                char const * const numeric_risk_str = TOKEN_GET_KEY(sock, current, &numeric_risk_len);
                 nDPIsrvd_ull numeric_risk_value = (nDPIsrvd_ull)-1;
+                char numeric_risk_buf[numeric_risk_len + 1];
 
-                if (str_value_to_ull(TOKEN_GET_KEY(sock, current, NULL), &numeric_risk_value) == CONVERSION_OK)
+                if (numeric_risk_len > 0 && numeric_risk_str != NULL)
                 {
-                    if ((flow_user_data->detected_risks & (1ull << numeric_risk_value)) == 0)
+                    strncpy(numeric_risk_buf, numeric_risk_str, numeric_risk_len);
+                    numeric_risk_buf[numeric_risk_len] = '\0';
+
+                    struct nDPIsrvd_json_token const * const severity =
+                        TOKEN_GET_SZ(sock, "ndpi", "flow_risk", numeric_risk_buf, "severity");
+                    uint8_t severity_index;
+
+                    if (collectd_map_flow_u8(
+                            sock, severity, severity_map, nDPIsrvd_ARRAY_LENGTH(severity_map), &severity_index) != 0)
+                    {
+                        severity_index = 0;
+                    }
+
+                    if (severity_index != 0)
+                    {
+                        for (uint8_t i = 0; i < MAX_SEVERITIES_PER_FLOW; ++i)
+                        {
+                            if (flow_user_data->severities[i] != 0)
+                            {
+                                continue;
+                            }
+                            if (flow_user_data->severities[i] == severity_index)
+                            {
+                                break;
+                            }
+
+                            if (collectd_map_value_to_stat(
+                                    sock, severity, severity_map, nDPIsrvd_ARRAY_LENGTH(severity_map)) != 0)
+                            {
+                                severity_index = 0;
+                                break;
+                            }
+                            flow_user_data->severities[i] = severity_index;
+                            break;
+                        }
+                    }
+                    if (severity_index == 0)
+                    {
+                        size_t value_len = 0;
+                        char const * const value_str = TOKEN_GET_VALUE(sock, severity, &value_len);
+
+                        if (value_len > 0 && value_str != NULL)
+                        {
+                            logger(1,
+                                   "Unknown/Invalid JSON value for key 'ndpi','breed': %.*s",
+                                   (int)value_len,
+                                   value_str);
+                        }
+                    }
+
+                    if (str_value_to_ull(numeric_risk_str, &numeric_risk_value) == CONVERSION_OK)
                     {
                         if (numeric_risk_value < NDPI_MAX_RISK && numeric_risk_value > 0)
                         {
-                            collectd_statistics.flow_risk_count[numeric_risk_value - 1]++;
-                            flow_user_data->detected_risks |= (1ull << (numeric_risk_value - 1));
+                            for (uint8_t i = 0; i < MAX_RISKS_PER_FLOW; ++i)
+                            {
+                                if (flow_user_data->risks[i] != 0)
+                                {
+                                    continue;
+                                }
+                                if (flow_user_data->risks[i] == numeric_risk_value)
+                                {
+                                    break;
+                                }
+
+                                COLLECTD_STATS_GAUGE_INC(flow_risk_count[numeric_risk_value]);
+                                flow_user_data->risks[i] = numeric_risk_value;
+                                break;
+                            }
                         }
-                        else
+                        else if (flow_user_data->risk_ndpid_invalid == 0)
                         {
-                            collectd_statistics.flow_risk_unknown_count++;
+                            flow_user_data->risk_ndpid_invalid = 1;
+                            COLLECTD_STATS_GAUGE_INC(flow_risk_unknown_count);
                         }
                     }
+                    else
+                    {
+                        logger(1, "Invalid numeric risk value: %s", numeric_risk_buf);
+                    }
+                }
+                else
+                {
+                    logger(1, "%s", "Missing numeric risk value");
+                }
+            }
+        }
+
+        if (flow_user_data->breed == 0 && flow_user_data->breed_ndpid_invalid == 0)
+        {
+            struct nDPIsrvd_json_token const * const breed = TOKEN_GET_SZ(sock, "ndpi", "breed");
+            if (collectd_map_flow_u8(
+                    sock, breed, breeds_map, nDPIsrvd_ARRAY_LENGTH(breeds_map), &flow_user_data->breed) != 0 ||
+                collectd_map_value_to_stat(sock, breed, breeds_map, nDPIsrvd_ARRAY_LENGTH(breeds_map)) != 0)
+            {
+                size_t value_len = 0;
+                char const * const value_str = TOKEN_GET_VALUE(sock, breed, &value_len);
+
+                flow_user_data->breed = 0;
+                flow_user_data->breed_ndpid_invalid = 1;
+                if (value_len > 0 && value_str != NULL)
+                {
+                    logger(1, "Unknown/Invalid JSON value for key 'ndpi','breed': %.*s", (int)value_len, value_str);
+                }
+            }
+        }
+
+        if (flow_user_data->category == 0 && flow_user_data->category_ndpid_invalid == 0)
+        {
+            struct nDPIsrvd_json_token const * const category = TOKEN_GET_SZ(sock, "ndpi", "category");
+            if (collectd_map_flow_u8(
+                    sock, category, categories_map, nDPIsrvd_ARRAY_LENGTH(categories_map), &flow_user_data->category) !=
+                    0 ||
+                collectd_map_value_to_stat(sock, category, categories_map, nDPIsrvd_ARRAY_LENGTH(categories_map)) != 0)
+            {
+                size_t value_len = 0;
+                char const * const value_str = TOKEN_GET_VALUE(sock, category, &value_len);
+
+                flow_user_data->category = 0;
+                flow_user_data->category_ndpid_invalid = 1;
+                if (value_len > 0 && value_str != NULL)
+                {
+                    logger(1, "Unknown/Invalid JSON value for key 'ndpi','category': %.*s", (int)value_len, value_str);
                 }
             }
         }
 
-        struct nDPIsrvd_json_token const * const breed = TOKEN_GET_SZ(sock, "ndpi", "breed");
-        collectd_map_token_to_stat(sock, breed, breeds_map, nDPIsrvd_ARRAY_LENGTH(breeds_map));
+        if (flow_user_data->confidence == 0 && flow_user_data->confidence_ndpid_invalid == 0)
+        {
+            struct nDPIsrvd_json_token const * const token = TOKEN_GET_SZ(sock, "ndpi", "confidence");
+            struct nDPIsrvd_json_token const * current = NULL;
+            int next_child_index = -1;
+
+            if ((current = nDPIsrvd_get_next_token(sock, token, &next_child_index)) == NULL)
+            {
+                flow_user_data->confidence_ndpid_invalid = 1;
+            }
+            else if (nDPIsrvd_get_next_token(sock, token, &next_child_index) == NULL)
+            {
+                if (collectd_map_flow_u8(sock,
+                                         current,
+                                         confidence_map,
+                                         nDPIsrvd_ARRAY_LENGTH(confidence_map),
+                                         &flow_user_data->confidence) != 0 ||
+                    collectd_map_value_to_stat(sock, current, confidence_map, nDPIsrvd_ARRAY_LENGTH(confidence_map)) !=
+                        0)
+                {
+                    flow_user_data->confidence = 0;
+                    flow_user_data->confidence_ndpid_invalid = 1;
+                }
+            }
+            else
+            {
+                flow_user_data->confidence_ndpid_invalid = 1;
+            }
+
+            if (flow_user_data->confidence_ndpid_invalid != 0)
+            {
+                size_t value_len = 0;
+                char const * const value_str = TOKEN_GET_VALUE(sock, current, &value_len);
+
+                logger(1, "Unknown/Invalid JSON value for key 'ndpi','confidence': %.*s", (int)value_len, value_str);
+            }
+        }
+    }
+
+    if (TOKEN_VALUE_EQUALS_SZ(sock, flow_state, "info") != 0)
+    {
+        if (flow_user_data->is_info == 0)
+        {
+            flow_user_data->is_info = 1;
+            COLLECTD_STATS_GAUGE_INC(flow_state_info);
+        }
+    }
+    else if (TOKEN_VALUE_EQUALS_SZ(sock, flow_state, "finished") != 0)
+    {
+        if (flow_user_data->is_finished == 0)
+        {
+            if (flow_user_data->is_info != 0)
+            {
+                flow_user_data->is_info = 0;
+                COLLECTD_STATS_GAUGE_RES(flow_state_info);
+            }
+            flow_user_data->is_finished = 1;
+            COLLECTD_STATS_GAUGE_INC(flow_state_finished);
+        }
+    }
+
+    if (TOKEN_VALUE_TO_ULL(sock, TOKEN_GET_SZ(sock, "flow_src_tot_l4_payload_len"), &total_bytes_ull[0]) ==
+            CONVERSION_OK &&
+        TOKEN_VALUE_TO_ULL(sock, TOKEN_GET_SZ(sock, "flow_dst_tot_l4_payload_len"), &total_bytes_ull[1]) ==
+            CONVERSION_OK)
+    {
+        collectd_statistics.counters.flow_src_total_bytes +=
+            total_bytes_ull[0] - flow_user_data->last_flow_src_l4_payload_len;
+        collectd_statistics.counters.flow_dst_total_bytes +=
+            total_bytes_ull[1] - flow_user_data->last_flow_dst_l4_payload_len;
+
+        flow_user_data->last_flow_src_l4_payload_len = total_bytes_ull[0];
+        flow_user_data->last_flow_dst_l4_payload_len = total_bytes_ull[1];
+    }
+
+    if (TOKEN_VALUE_EQUALS_SZ(sock, flow_event_name, "end") != 0 ||
+        TOKEN_VALUE_EQUALS_SZ(sock, flow_event_name, "idle") != 0)
+    {
+        collectd_unmap_flow_from_stat(flow_user_data);
+    }
+}
+
+static enum nDPIsrvd_callback_return collectd_json_callback(struct nDPIsrvd_socket * const sock,
+                                                            struct nDPIsrvd_instance * const instance,
+                                                            struct nDPIsrvd_thread_data * const thread_data,
+                                                            struct nDPIsrvd_flow * const flow)
+{
+    (void)instance;
+    (void)thread_data;
+
+    struct nDPIsrvd_json_token const * const flow_event = TOKEN_GET_SZ(sock, "flow_event_name");
+    struct nDPIsrvd_json_token const * const packet_event = TOKEN_GET_SZ(sock, "packet_event_name");
+    struct nDPIsrvd_json_token const * const daemon_event = TOKEN_GET_SZ(sock, "daemon_event_name");
+    struct nDPIsrvd_json_token const * const error_event = TOKEN_GET_SZ(sock, "error_event_name");
+
+    COLLECTD_STATS_COUNTER_INC(json_lines);
+    collectd_statistics.counters.json_bytes += sock->buffer.json_message_length + NETWORK_BUFFER_LENGTH_DIGITS;
+
+    process_flow_stats(sock, flow);
+
+    if (flow_event != NULL &&
+        collectd_map_value_to_stat(sock, flow_event, flow_event_map, nDPIsrvd_ARRAY_LENGTH(flow_event_map)) != 0)
+    {
+        logger(1, "%s", "Unknown flow_event_name");
+    }
 
-        struct nDPIsrvd_json_token const * const category = TOKEN_GET_SZ(sock, "ndpi", "category");
-        collectd_map_token_to_stat(sock, category, categories_map, nDPIsrvd_ARRAY_LENGTH(categories_map));
+    if (packet_event != NULL &&
+        collectd_map_value_to_stat(sock, packet_event, packet_event_map, nDPIsrvd_ARRAY_LENGTH(packet_event_map)) != 0)
+    {
+        logger(1, "%s", "Unknown packet_event_name");
+    }
+
+    if (daemon_event != NULL &&
+        collectd_map_value_to_stat(sock, daemon_event, daemon_event_map, nDPIsrvd_ARRAY_LENGTH(daemon_event_map)) != 0)
+    {
+        logger(1, "%s", "Unknown daemon_event_name");
+    }
+
+    if (error_event != NULL &&
+        collectd_map_value_to_stat(sock, error_event, error_event_map, nDPIsrvd_ARRAY_LENGTH(error_event_map)) != 0)
+    {
+        logger(1, "%s", "Unknown error_event_name");
     }
 
     return CALLBACK_OK;
@@ -770,13 +1483,13 @@ int main(int argc, char ** argv)
     enum nDPIsrvd_connect_return connect_ret;
     int retval = 1, epollfd = -1;
 
-    openlog("nDPIsrvd-collectd", LOG_CONS, LOG_DAEMON);
+    init_logging("nDPIsrvd-collectd");
 
     struct nDPIsrvd_socket * sock =
         nDPIsrvd_socket_init(0, 0, 0, sizeof(struct flow_user_data), collectd_json_callback, NULL, NULL);
     if (sock == NULL)
     {
-        LOG(LOG_DAEMON | LOG_ERR, "%s", "nDPIsrvd socket memory allocation failed!");
+        LOGGER_EARLY(1, "%s", "nDPIsrvd socket memory allocation failed!");
         return 1;
     }
 
@@ -787,33 +1500,32 @@ int main(int argc, char ** argv)
 
     if (getenv("COLLECTD_HOSTNAME") == NULL && getenv("COLLECTD_INTERVAL") == NULL)
     {
-        LOG(LOG_DAEMON | LOG_NOTICE, "Recv buffer size: %u", NETWORK_BUFFER_MAX_SIZE);
-        LOG(LOG_DAEMON | LOG_NOTICE, "Connecting to `%s'..", serv_optarg);
+        LOGGER_EARLY(0, "Recv buffer size: %u", NETWORK_BUFFER_MAX_SIZE);
+        LOGGER_EARLY(0, "Connecting to `%s'..", serv_optarg);
     }
     else
     {
-        quiet = 1;
-        LOG(LOG_DAEMON | LOG_NOTICE, "Collectd hostname: %s", getenv("COLLECTD_HOSTNAME"));
-        LOG(LOG_DAEMON | LOG_NOTICE, "Collectd interval: %llu", collectd_interval_ull);
+        LOGGER_EARLY(0, "Collectd hostname: %s", getenv("COLLECTD_HOSTNAME"));
+        LOGGER_EARLY(0, "Collectd interval: %llu", collectd_interval_ull);
     }
 
     if (setvbuf(stdout, NULL, _IONBF, 0) != 0)
     {
-        LOG(LOG_DAEMON | LOG_ERR,
-            "Could not set stdout unbuffered: %s. Collectd may receive too old PUTVALs and complain.",
-            strerror(errno));
+        LOGGER_EARLY(1,
+                     "Could not set stdout unbuffered: %s. Collectd may receive too old PUTVALs and complain.",
+                     strerror(errno));
     }
 
     connect_ret = nDPIsrvd_connect(sock);
     if (connect_ret != CONNECT_OK)
     {
-        LOG(LOG_DAEMON | LOG_ERR, "nDPIsrvd socket connect to %s failed!", serv_optarg);
+        LOGGER_EARLY(1, "nDPIsrvd socket connect to %s failed!", serv_optarg);
         goto failure;
     }
 
     if (nDPIsrvd_set_nonblock(sock) != 0)
     {
-        LOG(LOG_DAEMON | LOG_ERR, "nDPIsrvd set nonblock failed: %s", strerror(errno));
+        LOGGER_EARLY(1, "nDPIsrvd set nonblock failed: %s", strerror(errno));
         goto failure;
     }
 
@@ -826,13 +1538,13 @@ int main(int argc, char ** argv)
     epollfd = epoll_create1(0);
     if (epollfd < 0)
     {
-        LOG(LOG_DAEMON | LOG_ERR, "Error creating epoll: %s", strerror(errno));
+        LOGGER_EARLY(1, "Error creating epoll: %s", strerror(errno));
         goto failure;
     }
 
     if (create_collectd_timer() != 0)
     {
-        LOG(LOG_DAEMON | LOG_ERR, "Error creating timer: %s", strerror(errno));
+        LOGGER_EARLY(1, "Error creating timer: %s", strerror(errno));
         goto failure;
     }
 
@@ -840,7 +1552,7 @@ int main(int argc, char ** argv)
         struct epoll_event timer_event = {.data.fd = collectd_timerfd, .events = EPOLLIN};
         if (epoll_ctl(epollfd, EPOLL_CTL_ADD, collectd_timerfd, &timer_event) < 0)
         {
-            LOG(LOG_DAEMON | LOG_ERR, "Error adding JSON fd to epoll: %s", strerror(errno));
+            LOGGER_EARLY(1, "Error adding JSON fd to epoll: %s", strerror(errno));
             goto failure;
         }
     }
@@ -849,12 +1561,12 @@ int main(int argc, char ** argv)
         struct epoll_event socket_event = {.data.fd = sock->fd, .events = EPOLLIN};
         if (epoll_ctl(epollfd, EPOLL_CTL_ADD, sock->fd, &socket_event) < 0)
         {
-            LOG(LOG_DAEMON | LOG_ERR, "Error adding nDPIsrvd socket fd to epoll: %s", strerror(errno));
+            LOGGER_EARLY(1, "Error adding nDPIsrvd socket fd to epoll: %s", strerror(errno));
             goto failure;
         }
     }
 
-    LOG(LOG_DAEMON | LOG_NOTICE, "%s", "Initialization succeeded.");
+    logger(0, "%s", "Initialization succeeded.");
     retval = mainloop(epollfd, sock);
 
     if (getenv("COLLECTD_INTERVAL") == NULL)
@@ -866,7 +1578,7 @@ failure:
     nDPIsrvd_socket_free(&sock);
     close(collectd_timerfd);
     close(epollfd);
-    closelog();
+    shutdown_logging();
 
     return retval;
 }
diff --git a/examples/c-collectd/rrdgraph.sh b/examples/c-collectd/rrdgraph.sh
index 022ea5ebc..19f1d59f5 100755
--- a/examples/c-collectd/rrdgraph.sh
+++ b/examples/c-collectd/rrdgraph.sh
@@ -3,7 +3,7 @@
 RRDDIR="${1}"
 OUTDIR="${2}"
 RRDARGS="--width=800 --height=400"
-REQUIRED_RRDCNT=106
+REQUIRED_RRDCNT=130
 
 if [ -z "${RRDDIR}" ]; then
 	printf '%s: Missing RRD directory which contains nDPIsrvd/Collectd files.\n' "${0}"
@@ -62,9 +62,9 @@ rrdtool_graph() {
 }
 
 rrdtool_graph Flows Amount "${OUTDIR}/flows" \
-	DEF:flows_new=${RRDDIR}/gauge-flow_new_count.rrd:value:AVERAGE \
-        DEF:flows_end=${RRDDIR}/gauge-flow_end_count.rrd:value:AVERAGE \
-        DEF:flows_idle=${RRDDIR}/gauge-flow_idle_count.rrd:value:AVERAGE \
+	DEF:flows_new=${RRDDIR}/counter-flow_new_count.rrd:value:AVERAGE \
+        DEF:flows_end=${RRDDIR}/counter-flow_end_count.rrd:value:AVERAGE \
+        DEF:flows_idle=${RRDDIR}/counter-flow_idle_count.rrd:value:AVERAGE \
 	$(rrdtool_graph_colorize_missing_data flows_new) \
 	AREA:flows_new#54EC48::STACK \
 	AREA:flows_end#ECD748::STACK \
@@ -79,8 +79,8 @@ rrdtool_graph Detections Amount "${OUTDIR}/detections" \
 	DEF:flows_detected=${RRDDIR}/gauge-flow_detected_count.rrd:value:AVERAGE \
 	DEF:flows_guessed=${RRDDIR}/gauge-flow_guessed_count.rrd:value:AVERAGE \
 	DEF:flows_not_detected=${RRDDIR}/gauge-flow_not_detected_count.rrd:value:AVERAGE \
-	DEF:flows_detection_update=${RRDDIR}/gauge-flow_detection_update_count.rrd:value:AVERAGE \
-	DEF:flows_risky=${RRDDIR}/gauge-flow_risky_count.rrd:value:AVERAGE \
+	DEF:flows_detection_update=${RRDDIR}/counter-flow_detection_update_count.rrd:value:AVERAGE \
+	DEF:flows_risky=${RRDDIR}/counter-flow_risky_count.rrd:value:AVERAGE \
 	$(rrdtool_graph_colorize_missing_data flows_detected) \
 	AREA:flows_detected#00bfff::STACK \
 	AREA:flows_detection_update#a1b8c4::STACK \
@@ -98,8 +98,8 @@ rrdtool_graph Detections Amount "${OUTDIR}/detections" \
 	LINE2:flows_risky#b32d00:"Risky..........." \
 	$(rrdtool_graph_print_cur_min_max_avg flows_risky)
 rrdtool_graph "Traffic (IN/OUT)" Bytes "${OUTDIR}/traffic" \
-	DEF:total_src_bytes=${RRDDIR}/gauge-flow_src_total_bytes.rrd:value:AVERAGE \
-	DEF:total_dst_bytes=${RRDDIR}/gauge-flow_dst_total_bytes.rrd:value:AVERAGE \
+	DEF:total_src_bytes=${RRDDIR}/counter-flow_src_total_bytes.rrd:value:AVERAGE \
+	DEF:total_dst_bytes=${RRDDIR}/counter-flow_dst_total_bytes.rrd:value:AVERAGE \
 	$(rrdtool_graph_colorize_missing_data total_src_bytes) \
 	AREA:total_src_bytes#00cc99:"Total-Bytes-Source2Dest":STACK \
 	$(rrdtool_graph_print_cur_min_max_avg total_src_bytes) \
@@ -137,7 +137,45 @@ rrdtool_graph Layer4-Flows Amount "${OUTDIR}/layer4" \
 	$(rrdtool_graph_print_cur_min_max_avg layer4_icmp) \
 	LINE2:layer4_other#83588d:"Other" \
 	$(rrdtool_graph_print_cur_min_max_avg layer4_other)
-rrdtool_graph Flow-Breeds Amount "${OUTDIR}/breed" \
+rrdtool_graph Confidence Amount "${OUTDIR}/confidence" \
+	DEF:conf_ip=${RRDDIR}/gauge-flow_confidence_by_ip.rrd:value:AVERAGE \
+	DEF:conf_port=${RRDDIR}/gauge-flow_confidence_by_port.rrd:value:AVERAGE \
+	DEF:conf_aggr=${RRDDIR}/gauge-flow_confidence_dpi_aggressive.rrd:value:AVERAGE \
+	DEF:conf_cache=${RRDDIR}/gauge-flow_confidence_dpi_cache.rrd:value:AVERAGE \
+	DEF:conf_pcache=${RRDDIR}/gauge-flow_confidence_dpi_partial_cache.rrd:value:AVERAGE \
+	DEF:conf_part=${RRDDIR}/gauge-flow_confidence_dpi_partial.rrd:value:AVERAGE \
+	DEF:conf_dpi=${RRDDIR}/gauge-flow_confidence_dpi.rrd:value:AVERAGE \
+	DEF:conf_nbpf=${RRDDIR}/gauge-flow_confidence_nbpf.rrd:value:AVERAGE \
+	DEF:conf_ukn=${RRDDIR}/gauge-flow_confidence_unknown.rrd:value:AVERAGE \
+	$(rrdtool_graph_colorize_missing_data conf_ip) \
+	AREA:conf_ip#4dff4d::STACK \
+	AREA:conf_port#c2ff33::STACK \
+	AREA:conf_aggr#ffe433::STACK \
+	AREA:conf_cache#ffb133::STACK \
+	AREA:conf_pcache#ff5f33::STACK \
+	AREA:conf_part#e74b5b::STACK \
+	AREA:conf_dpi#a5aca0::STACK \
+	AREA:conf_nbpf#d7c1cc::STACK \
+	AREA:conf_ukn#ddccbb::STACK \
+	LINE2:conf_ip#00e600:"By-IP................" \
+	$(rrdtool_graph_print_cur_min_max_avg conf_ip) \
+	LINE2:conf_port#8fce00:"By-Port.............." \
+	$(rrdtool_graph_print_cur_min_max_avg conf_port) \
+	LINE2:conf_aggr#e6c700:"DPI-Aggressive......." \
+	$(rrdtool_graph_print_cur_min_max_avg conf_aggr) \
+	LINE2:conf_cache#e68e00:"DPI-Cache............" \
+	$(rrdtool_graph_print_cur_min_max_avg conf_cache) \
+	LINE2:conf_pcache#e63200:"DPI-Partial-Cache...." \
+	$(rrdtool_graph_print_cur_min_max_avg conf_pcache) \
+	LINE2:conf_part#c61b2b:"DPI-Partial.........." \
+	$(rrdtool_graph_print_cur_min_max_avg conf_part) \
+	LINE2:conf_dpi#7e8877:"DPI.................." \
+	$(rrdtool_graph_print_cur_min_max_avg conf_dpi) \
+	LINE2:conf_nbpf#ae849a:"nBPF................." \
+	$(rrdtool_graph_print_cur_min_max_avg conf_nbpf) \
+	LINE2:conf_ukn#aa9988:"Unknown.............." \
+	$(rrdtool_graph_print_cur_min_max_avg conf_ukn)
+rrdtool_graph Breeds Amount "${OUTDIR}/breed" \
 	DEF:breed_safe=${RRDDIR}/gauge-flow_breed_safe_count.rrd:value:AVERAGE \
 	DEF:breed_acceptable=${RRDDIR}/gauge-flow_breed_acceptable_count.rrd:value:AVERAGE \
 	DEF:breed_fun=${RRDDIR}/gauge-flow_breed_fun_count.rrd:value:AVERAGE \
@@ -171,17 +209,22 @@ rrdtool_graph Flow-Breeds Amount "${OUTDIR}/breed" \
 	$(rrdtool_graph_print_cur_min_max_avg breed_unrated) \
 	LINE2:breed_unknown#ae849a:"Unknown.............." \
 	$(rrdtool_graph_print_cur_min_max_avg breed_unknown)
-rrdtool_graph Flow-Categories 'Amount(SUM)' "${OUTDIR}/categories" \
+rrdtool_graph Categories 'Amount(SUM)' "${OUTDIR}/categories" \
+	DEF:cat_adlt=${RRDDIR}/gauge-flow_category_adult_content_count.rrd:value:AVERAGE \
 	DEF:cat_ads=${RRDDIR}/gauge-flow_category_advertisment_count.rrd:value:AVERAGE \
 	DEF:cat_chat=${RRDDIR}/gauge-flow_category_chat_count.rrd:value:AVERAGE \
 	DEF:cat_cloud=${RRDDIR}/gauge-flow_category_cloud_count.rrd:value:AVERAGE \
 	DEF:cat_collab=${RRDDIR}/gauge-flow_category_collaborative_count.rrd:value:AVERAGE \
+	DEF:cat_conn=${RRDDIR}/gauge-flow_category_conn_check_count.rrd:value:AVERAGE \
+	DEF:cat_cybr=${RRDDIR}/gauge-flow_category_cybersecurity_count.rrd:value:AVERAGE \
 	DEF:cat_xfer=${RRDDIR}/gauge-flow_category_data_transfer_count.rrd:value:AVERAGE \
 	DEF:cat_db=${RRDDIR}/gauge-flow_category_database_count.rrd:value:AVERAGE \
 	DEF:cat_dl=${RRDDIR}/gauge-flow_category_download_count.rrd:value:AVERAGE \
 	DEF:cat_mail=${RRDDIR}/gauge-flow_category_email_count.rrd:value:AVERAGE \
 	DEF:cat_fs=${RRDDIR}/gauge-flow_category_file_sharing_count.rrd:value:AVERAGE \
 	DEF:cat_game=${RRDDIR}/gauge-flow_category_game_count.rrd:value:AVERAGE \
+	DEF:cat_gamb=${RRDDIR}/gauge-flow_category_gambling_count.rrd:value:AVERAGE \
+	DEF:cat_iot=${RRDDIR}/gauge-flow_category_iot_scada_count.rrd:value:AVERAGE \
 	DEF:cat_mal=${RRDDIR}/gauge-flow_category_malware_count.rrd:value:AVERAGE \
 	DEF:cat_med=${RRDDIR}/gauge-flow_category_media_count.rrd:value:AVERAGE \
 	DEF:cat_min=${RRDDIR}/gauge-flow_category_mining_count.rrd:value:AVERAGE \
@@ -196,17 +239,21 @@ rrdtool_graph Flow-Categories 'Amount(SUM)' "${OUTDIR}/categories" \
 	DEF:cat_str=${RRDDIR}/gauge-flow_category_streaming_count.rrd:value:AVERAGE \
 	DEF:cat_sys=${RRDDIR}/gauge-flow_category_system_count.rrd:value:AVERAGE \
 	DEF:cat_ukn=${RRDDIR}/gauge-flow_category_unknown_count.rrd:value:AVERAGE \
+	DEF:cat_uns=${RRDDIR}/gauge-flow_category_unspecified_count.rrd:value:AVERAGE \
 	DEF:cat_vid=${RRDDIR}/gauge-flow_category_video_count.rrd:value:AVERAGE \
+	DEF:cat_vrt=${RRDDIR}/gauge-flow_category_virt_assistant_count.rrd:value:AVERAGE \
 	DEF:cat_voip=${RRDDIR}/gauge-flow_category_voip_count.rrd:value:AVERAGE \
 	DEF:cat_vpn=${RRDDIR}/gauge-flow_category_vpn_count.rrd:value:AVERAGE \
 	DEF:cat_web=${RRDDIR}/gauge-flow_category_web_count.rrd:value:AVERAGE \
-	DEF:cat_banned=${RRDDIR}/gauge-flow_category_web_count.rrd:value:AVERAGE \
-	DEF:cat_unavail=${RRDDIR}/gauge-flow_category_web_count.rrd:value:AVERAGE \
-	DEF:cat_allowed=${RRDDIR}/gauge-flow_category_web_count.rrd:value:AVERAGE \
-	DEF:cat_antimal=${RRDDIR}/gauge-flow_category_web_count.rrd:value:AVERAGE \
-	DEF:cat_crypto=${RRDDIR}/gauge-flow_category_web_count.rrd:value:AVERAGE \
-	$(rrdtool_graph_colorize_missing_data cat_ads) \
-	AREA:cat_ads#f1c232:"Advertisment..........." \
+	DEF:cat_banned=${RRDDIR}/gauge-flow_category_banned_site_count.rrd:value:AVERAGE \
+	DEF:cat_unavail=${RRDDIR}/gauge-flow_category_site_unavail_count.rrd:value:AVERAGE \
+	DEF:cat_allowed=${RRDDIR}/gauge-flow_category_allowed_site_count.rrd:value:AVERAGE \
+	DEF:cat_antimal=${RRDDIR}/gauge-flow_category_antimalware_count.rrd:value:AVERAGE \
+	DEF:cat_crypto=${RRDDIR}/gauge-flow_category_crypto_currency_count.rrd:value:AVERAGE \
+	$(rrdtool_graph_colorize_missing_data cat_adlt) \
+	AREA:cat_adlt#f0c032:"Adult.................." \
+	$(rrdtool_graph_print_cur_min_max_avg cat_adlt) \
+	STACK:cat_ads#f1c232:"Advertisment..........." \
 	$(rrdtool_graph_print_cur_min_max_avg cat_ads) \
 	STACK:cat_chat#6fa8dc:"Chat..................." \
 	$(rrdtool_graph_print_cur_min_max_avg cat_chat) \
@@ -214,6 +261,10 @@ rrdtool_graph Flow-Categories 'Amount(SUM)' "${OUTDIR}/categories" \
 	$(rrdtool_graph_print_cur_min_max_avg cat_cloud) \
 	STACK:cat_collab#3212aa:"Collaborative.........." \
 	$(rrdtool_graph_print_cur_min_max_avg cat_collab) \
+	STACK:cat_conn#22aa11:"Connection-Check......." \
+	$(rrdtool_graph_print_cur_min_max_avg cat_conn) \
+	STACK:cat_cybr#00ff00:"Cybersecurity.........." \
+	$(rrdtool_graph_print_cur_min_max_avg cat_cybr) \
 	STACK:cat_xfer#16537e:"Data-Transfer.........." \
 	$(rrdtool_graph_print_cur_min_max_avg cat_xfer) \
 	STACK:cat_db#cc0000:"Database..............." \
@@ -226,6 +277,10 @@ rrdtool_graph Flow-Categories 'Amount(SUM)' "${OUTDIR}/categories" \
 	$(rrdtool_graph_print_cur_min_max_avg cat_fs) \
 	STACK:cat_game#00ff26:"Game..................." \
 	$(rrdtool_graph_print_cur_min_max_avg cat_game) \
+	STACK:cat_gamb#aa0026:"Gambling..............." \
+	$(rrdtool_graph_print_cur_min_max_avg cat_gamb) \
+	STACK:cat_iot#227867:"IoT-Scada.............." \
+	$(rrdtool_graph_print_cur_min_max_avg cat_iot) \
 	STACK:cat_mal#f44336:"Malware................" \
 	$(rrdtool_graph_print_cur_min_max_avg cat_mal) \
 	STACK:cat_med#ff8300:"Media.................." \
@@ -254,53 +309,56 @@ rrdtool_graph Flow-Categories 'Amount(SUM)' "${OUTDIR}/categories" \
 	$(rrdtool_graph_print_cur_min_max_avg cat_sys) \
 	STACK:cat_ukn#999999:"Unknown................" \
 	$(rrdtool_graph_print_cur_min_max_avg cat_ukn) \
+	STACK:cat_uns#999999:"Unspecified............" \
+	$(rrdtool_graph_print_cur_min_max_avg cat_uns) \
 	STACK:cat_vid#518820:"Video.................." \
 	$(rrdtool_graph_print_cur_min_max_avg cat_vid) \
+	STACK:cat_vrt#216820:"Virtual-Assistant......" \
+	$(rrdtool_graph_print_cur_min_max_avg cat_vrt) \
 	STACK:cat_voip#ffc700:"Voice-Over-IP.........." \
 	$(rrdtool_graph_print_cur_min_max_avg cat_voip) \
 	STACK:cat_vpn#378035:"Virtual-Private-Network" \
 	$(rrdtool_graph_print_cur_min_max_avg cat_vpn) \
 	STACK:cat_web#00fffb:"Web...................." \
 	$(rrdtool_graph_print_cur_min_max_avg cat_web) \
-	STACK:cat_banned#ff1010:"Banned Sites..........." \
+	STACK:cat_banned#ff1010:"Banned-Sites..........." \
 	$(rrdtool_graph_print_cur_min_max_avg cat_banned) \
-	STACK:cat_unavail#ff1010:"Sites Unavailable......" \
+	STACK:cat_unavail#ff1010:"Sites-Unavailable......" \
 	$(rrdtool_graph_print_cur_min_max_avg cat_unavail) \
-	STACK:cat_allowed#ff1010:"Allowed Sites.........." \
+	STACK:cat_allowed#ff1010:"Allowed-Sites.........." \
 	$(rrdtool_graph_print_cur_min_max_avg cat_allowed) \
 	STACK:cat_antimal#ff1010:"Antimalware............" \
 	$(rrdtool_graph_print_cur_min_max_avg cat_antimal) \
-	STACK:cat_crypto#afaf00:"Crypto Currency........" \
+	STACK:cat_crypto#afaf00:"Crypto-Currency........" \
 	$(rrdtool_graph_print_cur_min_max_avg cat_crypto)
 rrdtool_graph JSON 'Lines' "${OUTDIR}/json_lines" \
-	DEF:json_lines=${RRDDIR}/gauge-json_lines.rrd:value:AVERAGE \
+	DEF:json_lines=${RRDDIR}/counter-json_lines.rrd:value:AVERAGE \
 	$(rrdtool_graph_colorize_missing_data json_lines) \
 	AREA:json_lines#4dff4d::STACK \
 	LINE2:json_lines#00e600:"JSON-lines" \
 	$(rrdtool_graph_print_cur_min_max_avg json_lines)
 rrdtool_graph JSON 'Bytes' "${OUTDIR}/json_bytes" \
-	DEF:json_bytes=${RRDDIR}/gauge-json_bytes.rrd:value:AVERAGE \
+	DEF:json_bytes=${RRDDIR}/counter-json_bytes.rrd:value:AVERAGE \
 	$(rrdtool_graph_colorize_missing_data json_bytes) \
 	AREA:json_bytes#4dff4d::STACK \
 	LINE2:json_bytes#00e600:"JSON-bytes" \
 	$(rrdtool_graph_print_cur_min_max_avg json_bytes)
-rrdtool_graph Events 'Amouunt' "${OUTDIR}/events" \
-	DEF:init=${RRDDIR}/gauge-init_count.rrd:value:AVERAGE \
-	DEF:reconnect=${RRDDIR}/gauge-reconnect_count.rrd:value:AVERAGE \
-	DEF:shutdown=${RRDDIR}/gauge-shutdown_count.rrd:value:AVERAGE \
-	DEF:status=${RRDDIR}/gauge-status_count.rrd:value:AVERAGE \
-	DEF:packet=${RRDDIR}/gauge-packet_count.rrd:value:AVERAGE \
-	DEF:packet_flow=${RRDDIR}/gauge-packet_flow_count.rrd:value:AVERAGE \
-	DEF:new=${RRDDIR}/gauge-flow_new_count.rrd:value:AVERAGE \
-	DEF:end=${RRDDIR}/gauge-flow_end_count.rrd:value:AVERAGE \
-	DEF:idle=${RRDDIR}/gauge-flow_idle_count.rrd:value:AVERAGE \
-	DEF:update=${RRDDIR}/gauge-flow_update_count.rrd:value:AVERAGE \
-	DEF:detection_update=${RRDDIR}/gauge-flow_detection_update_count.rrd:value:AVERAGE \
-	DEF:guessed=${RRDDIR}/gauge-flow_guessed_count.rrd:value:AVERAGE \
-	DEF:detected=${RRDDIR}/gauge-flow_detected_count.rrd:value:AVERAGE \
-	DEF:not_detected=${RRDDIR}/gauge-flow_not_detected_count.rrd:value:AVERAGE \
-	DEF:analyse=${RRDDIR}/gauge-flow_analyse_count.rrd:value:AVERAGE \
-	DEF:error=${RRDDIR}/gauge-error_count_sum.rrd:value:AVERAGE \
+rrdtool_graph Events 'Amount' "${OUTDIR}/events" \
+	DEF:init=${RRDDIR}/counter-init_count.rrd:value:AVERAGE \
+	DEF:reconnect=${RRDDIR}/counter-reconnect_count.rrd:value:AVERAGE \
+	DEF:shutdown=${RRDDIR}/counter-shutdown_count.rrd:value:AVERAGE \
+	DEF:status=${RRDDIR}/counter-status_count.rrd:value:AVERAGE \
+	DEF:packet=${RRDDIR}/counter-packet_count.rrd:value:AVERAGE \
+	DEF:packet_flow=${RRDDIR}/counter-packet_flow_count.rrd:value:AVERAGE \
+	DEF:new=${RRDDIR}/counter-flow_new_count.rrd:value:AVERAGE \
+	DEF:ewd=${RRDDIR}/counter-flow_end_count.rrd:value:AVERAGE \
+	DEF:idle=${RRDDIR}/counter-flow_idle_count.rrd:value:AVERAGE \
+	DEF:update=${RRDDIR}/counter-flow_update_count.rrd:value:AVERAGE \
+	DEF:detection_update=${RRDDIR}/counter-flow_detection_update_count.rrd:value:AVERAGE \
+	DEF:guessed=${RRDDIR}/counter-flow_guessed_count.rrd:value:AVERAGE \
+	DEF:detected=${RRDDIR}/counter-flow_detected_count.rrd:value:AVERAGE \
+	DEF:not_detected=${RRDDIR}/counter-flow_not_detected_count.rrd:value:AVERAGE \
+	DEF:analyse=${RRDDIR}/counter-flow_analyse_count.rrd:value:AVERAGE \
 	$(rrdtool_graph_colorize_missing_data init) \
 	AREA:init#f1c232:"Init..................." \
 	$(rrdtool_graph_print_cur_min_max_avg init) \
@@ -316,8 +374,8 @@ rrdtool_graph Events 'Amouunt' "${OUTDIR}/events" \
 	$(rrdtool_graph_print_cur_min_max_avg packet_flow) \
 	STACK:new#c76700:"New...................." \
 	$(rrdtool_graph_print_cur_min_max_avg new) \
-	STACK:end#c78500:"End...................." \
-	$(rrdtool_graph_print_cur_min_max_avg end) \
+	STACK:ewd#c78500:"End...................." \
+	$(rrdtool_graph_print_cur_min_max_avg ewd) \
 	STACK:idle#c7a900:"Idle..................." \
 	$(rrdtool_graph_print_cur_min_max_avg idle) \
 	STACK:update#c7c400:"Updates................" \
@@ -331,28 +389,25 @@ rrdtool_graph Events 'Amouunt' "${OUTDIR}/events" \
 	STACK:not_detected#00bdc7:"Not-Detected..........." \
 	$(rrdtool_graph_print_cur_min_max_avg not_detected) \
 	STACK:analyse#1400c7:"Analyse................" \
-	$(rrdtool_graph_print_cur_min_max_avg analyse) \
-	STACK:error#c70000:"Error.................." \
-	$(rrdtool_graph_print_cur_min_max_avg error)
-rrdtool_graph Error-Events 'Amouunt' "${OUTDIR}/error_events" \
-	DEF:error_0=${RRDDIR}/gauge-error_0_count.rrd:value:AVERAGE \
-	DEF:error_1=${RRDDIR}/gauge-error_1_count.rrd:value:AVERAGE \
-	DEF:error_2=${RRDDIR}/gauge-error_2_count.rrd:value:AVERAGE \
-	DEF:error_3=${RRDDIR}/gauge-error_3_count.rrd:value:AVERAGE \
-	DEF:error_4=${RRDDIR}/gauge-error_4_count.rrd:value:AVERAGE \
-	DEF:error_5=${RRDDIR}/gauge-error_5_count.rrd:value:AVERAGE \
-	DEF:error_6=${RRDDIR}/gauge-error_6_count.rrd:value:AVERAGE \
-	DEF:error_7=${RRDDIR}/gauge-error_7_count.rrd:value:AVERAGE \
-	DEF:error_8=${RRDDIR}/gauge-error_8_count.rrd:value:AVERAGE \
-	DEF:error_9=${RRDDIR}/gauge-error_9_count.rrd:value:AVERAGE \
-	DEF:error_10=${RRDDIR}/gauge-error_10_count.rrd:value:AVERAGE \
-	DEF:error_11=${RRDDIR}/gauge-error_11_count.rrd:value:AVERAGE \
-	DEF:error_12=${RRDDIR}/gauge-error_12_count.rrd:value:AVERAGE \
-	DEF:error_13=${RRDDIR}/gauge-error_13_count.rrd:value:AVERAGE \
-	DEF:error_14=${RRDDIR}/gauge-error_14_count.rrd:value:AVERAGE \
-	DEF:error_15=${RRDDIR}/gauge-error_15_count.rrd:value:AVERAGE \
-	DEF:error_16=${RRDDIR}/gauge-error_16_count.rrd:value:AVERAGE \
-	DEF:error_unknown=${RRDDIR}/gauge-error_unknown_count.rrd:value:AVERAGE \
+	$(rrdtool_graph_print_cur_min_max_avg analyse)
+rrdtool_graph Error-Events 'Amount' "${OUTDIR}/error_events" \
+	DEF:error_0=${RRDDIR}/counter-error_unknown_datalink.rrd:value:AVERAGE \
+	DEF:error_1=${RRDDIR}/counter-error_unknown_l3_protocol.rrd:value:AVERAGE \
+	DEF:error_2=${RRDDIR}/counter-error_unsupported_datalink.rrd:value:AVERAGE \
+	DEF:error_3=${RRDDIR}/counter-error_packet_too_short.rrd:value:AVERAGE \
+	DEF:error_4=${RRDDIR}/counter-error_packet_type_unknown.rrd:value:AVERAGE \
+	DEF:error_5=${RRDDIR}/counter-error_packet_header_invalid.rrd:value:AVERAGE \
+	DEF:error_6=${RRDDIR}/counter-error_ip4_packet_too_short.rrd:value:AVERAGE \
+	DEF:error_7=${RRDDIR}/counter-error_ip4_size_smaller_than_header.rrd:value:AVERAGE \
+	DEF:error_8=${RRDDIR}/counter-error_ip4_l4_payload_detection.rrd:value:AVERAGE \
+	DEF:error_9=${RRDDIR}/counter-error_ip6_packet_too_short.rrd:value:AVERAGE \
+	DEF:error_10=${RRDDIR}/counter-error_ip6_size_smaller_than_header.rrd:value:AVERAGE \
+	DEF:error_11=${RRDDIR}/counter-error_ip6_l4_payload_detection.rrd:value:AVERAGE \
+	DEF:error_12=${RRDDIR}/counter-error_tcp_packet_too_short.rrd:value:AVERAGE \
+	DEF:error_13=${RRDDIR}/counter-error_udp_packet_too_short.rrd:value:AVERAGE \
+	DEF:error_14=${RRDDIR}/counter-error_capture_size_smaller_than_packet.rrd:value:AVERAGE \
+	DEF:error_15=${RRDDIR}/counter-error_max_flows_to_track.rrd:value:AVERAGE \
+	DEF:error_16=${RRDDIR}/counter-error_flow_memory_alloc.rrd:value:AVERAGE \
 	$(rrdtool_graph_colorize_missing_data error_0) \
 	AREA:error_0#ff6a00:"Unknown-datalink-layer-packet............................" \
 	$(rrdtool_graph_print_cur_min_max_avg error_0) \
@@ -387,10 +442,38 @@ rrdtool_graph Error-Events 'Amouunt' "${OUTDIR}/error_events" \
 	STACK:error_15#4095bf:"Max-flows-to-track-reached..............................." \
 	$(rrdtool_graph_print_cur_min_max_avg error_15) \
 	STACK:error_16#0040ff:"Flow-memory-allocation-failed............................" \
-	$(rrdtool_graph_print_cur_min_max_avg error_16) \
-	STACK:error_unknown#4060bf:"Unknown-error............................................" \
-	$(rrdtool_graph_print_cur_min_max_avg error_unknown)
-rrdtool_graph Risky-Events 'Amouunt' "${OUTDIR}/risky_events" \
+	$(rrdtool_graph_print_cur_min_max_avg error_16)
+rrdtool_graph Risk-Severites Amount "${OUTDIR}/severities" \
+	DEF:sever_crit=${RRDDIR}/gauge-flow_severity_critical.rrd:value:AVERAGE \
+	DEF:sever_emer=${RRDDIR}/gauge-flow_severity_emergency.rrd:value:AVERAGE \
+	DEF:sever_high=${RRDDIR}/gauge-flow_severity_high.rrd:value:AVERAGE \
+	DEF:sever_low=${RRDDIR}/gauge-flow_severity_low.rrd:value:AVERAGE \
+	DEF:sever_med=${RRDDIR}/gauge-flow_severity_medium.rrd:value:AVERAGE \
+	DEF:sever_sev=${RRDDIR}/gauge-flow_severity_severe.rrd:value:AVERAGE \
+	DEF:sever_ukn=${RRDDIR}/gauge-flow_severity_unknown.rrd:value:AVERAGE \
+	$(rrdtool_graph_colorize_missing_data sever_crit) \
+	AREA:sever_crit#e68e00::STACK \
+	AREA:sever_emer#e63200::STACK \
+	AREA:sever_high#e6c700::STACK \
+	AREA:sever_low#00e600::STACK \
+	AREA:sever_med#8fce00::STACK \
+	AREA:sever_sev#c61b2b::STACK \
+	AREA:sever_ukn#7e8877::STACK \
+	LINE2:sever_crit#e68e00:"Critical............." \
+	$(rrdtool_graph_print_cur_min_max_avg sever_crit) \
+	LINE2:sever_emer#e63200:"Emergency............" \
+	$(rrdtool_graph_print_cur_min_max_avg sever_emer) \
+	LINE2:sever_high#e6c700:"High................." \
+	$(rrdtool_graph_print_cur_min_max_avg sever_high) \
+	LINE2:sever_low#00e600:"Low.................." \
+	$(rrdtool_graph_print_cur_min_max_avg sever_low) \
+	LINE2:sever_med#8fce00:"Medium..............." \
+	$(rrdtool_graph_print_cur_min_max_avg sever_med) \
+	LINE2:sever_sev#c61b2b:"Severe..............." \
+	$(rrdtool_graph_print_cur_min_max_avg sever_sev) \
+	LINE2:sever_ukn#7e8877:"Unknown.............." \
+	$(rrdtool_graph_print_cur_min_max_avg sever_ukn)
+rrdtool_graph Risks 'Amount' "${OUTDIR}/risky_events" \
 	DEF:risk_1=${RRDDIR}/gauge-flow_risk_1_count.rrd:value:AVERAGE \
 	DEF:risk_2=${RRDDIR}/gauge-flow_risk_2_count.rrd:value:AVERAGE \
 	DEF:risk_3=${RRDDIR}/gauge-flow_risk_3_count.rrd:value:AVERAGE \
@@ -440,6 +523,10 @@ rrdtool_graph Risky-Events 'Amouunt' "${OUTDIR}/risky_events" \
 	DEF:risk_47=${RRDDIR}/gauge-flow_risk_47_count.rrd:value:AVERAGE \
 	DEF:risk_48=${RRDDIR}/gauge-flow_risk_48_count.rrd:value:AVERAGE \
 	DEF:risk_49=${RRDDIR}/gauge-flow_risk_49_count.rrd:value:AVERAGE \
+	DEF:risk_50=${RRDDIR}/gauge-flow_risk_50_count.rrd:value:AVERAGE \
+	DEF:risk_51=${RRDDIR}/gauge-flow_risk_51_count.rrd:value:AVERAGE \
+	DEF:risk_52=${RRDDIR}/gauge-flow_risk_52_count.rrd:value:AVERAGE \
+	DEF:risk_53=${RRDDIR}/gauge-flow_risk_53_count.rrd:value:AVERAGE \
 	DEF:risk_unknown=${RRDDIR}/gauge-flow_risk_unknown_count.rrd:value:AVERAGE \
 	$(rrdtool_graph_colorize_missing_data risk_1) \
 	AREA:risk_1#ff0000:"XSS-Attack..............................................." \
@@ -540,5 +627,13 @@ rrdtool_graph Risky-Events 'Amouunt' "${OUTDIR}/risky_events" \
 	$(rrdtool_graph_print_cur_min_max_avg risk_48) \
 	STACK:risk_49#dfffdf:"Minor-Issues............................................." \
 	$(rrdtool_graph_print_cur_min_max_avg risk_49) \
+	STACK:risk_50#ef20df:"TCP-Connection-Issues...................................." \
+	$(rrdtool_graph_print_cur_min_max_avg risk_50) \
+	STACK:risk_51#ef60df:"Fully-Encrypted.........................................." \
+	$(rrdtool_graph_print_cur_min_max_avg risk_51) \
+	STACK:risk_52#efa0df:"Invalid-ALPN/SNI-combination............................." \
+	$(rrdtool_graph_print_cur_min_max_avg risk_52) \
+	STACK:risk_53#efffdf:"Malware-Host-Contacted..................................." \
+	$(rrdtool_graph_print_cur_min_max_avg risk_53) \
 	STACK:risk_unknown#df2060:"Unknown.................................................." \
 	$(rrdtool_graph_print_cur_min_max_avg risk_unknown)
diff --git a/examples/c-collectd/www/dpi/categories.html b/examples/c-collectd/www/dpi/categories.html
index fa7151d88..165b11a04 100644
--- a/examples/c-collectd/www/dpi/categories.html
+++ b/examples/c-collectd/www/dpi/categories.html
@@ -97,6 +97,18 @@
                   Categories
                 </a>
               </li>
+              <li class="nav-item">
+                <a class="nav-link" href="risks.html">
+                  <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-file-text">
+                    <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"></path>
+                    <polyline points="14 2 14 8 20 8"></polyline>
+                    <line x1="16" y1="13" x2="8" y2="13"></line>
+                    <line x1="16" y1="17" x2="8" y2="17"></line>
+                    <polyline points="10 9 9 9 8 9"></polyline>
+                  </svg>
+                  Risks
+                </a>
+              </li>
               <li class="nav-item">
                 <a class="nav-link" href="jsons.html">
                   <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-file-text">
diff --git a/examples/c-collectd/www/dpi/detections.html b/examples/c-collectd/www/dpi/detections.html
index af7fced30..ed4556b64 100644
--- a/examples/c-collectd/www/dpi/detections.html
+++ b/examples/c-collectd/www/dpi/detections.html
@@ -97,6 +97,18 @@
                   Categories
                 </a>
               </li>
+              <li class="nav-item">
+                <a class="nav-link" href="risks.html">
+                  <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-file-text">
+                    <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"></path>
+                    <polyline points="14 2 14 8 20 8"></polyline>
+                    <line x1="16" y1="13" x2="8" y2="13"></line>
+                    <line x1="16" y1="17" x2="8" y2="17"></line>
+                    <polyline points="10 9 9 9 8 9"></polyline>
+                  </svg>
+                  Risks
+                </a>
+              </li>
               <li class="nav-item">
                 <a class="nav-link" href="jsons.html">
                   <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-file-text">
@@ -146,6 +158,25 @@
             <img src="detections_past_year.png" class="img-fluid" alt="Responsive image">
           </div>
 
+          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
+            <img src="confidence_past_hour.png" class="img-fluid" alt="Responsive image">
+          </div>
+          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
+            <img src="confidence_past_12hours.png" class="img-fluid" alt="Responsive image">
+          </div>
+          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
+            <img src="confidence_past_day.png" class="img-fluid" alt="Responsive image">
+          </div>
+          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
+            <img src="confidence_past_week.png" class="img-fluid" alt="Responsive image">
+          </div>
+          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
+            <img src="confidence_past_month.png" class="img-fluid" alt="Responsive image">
+          </div>
+          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
+            <img src="confidence_past_year.png" class="img-fluid" alt="Responsive image">
+          </div>
+
         </main>
       </div>
     </div>
diff --git a/examples/c-collectd/www/dpi/events.html b/examples/c-collectd/www/dpi/events.html
index 3b43da92c..f1ef8cbae 100644
--- a/examples/c-collectd/www/dpi/events.html
+++ b/examples/c-collectd/www/dpi/events.html
@@ -97,6 +97,18 @@
                   Categories
                 </a>
               </li>
+              <li class="nav-item">
+                <a class="nav-link" href="risks.html">
+                  <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-file-text">
+                    <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"></path>
+                    <polyline points="14 2 14 8 20 8"></polyline>
+                    <line x1="16" y1="13" x2="8" y2="13"></line>
+                    <line x1="16" y1="17" x2="8" y2="17"></line>
+                    <polyline points="10 9 9 9 8 9"></polyline>
+                  </svg>
+                  Risks
+                </a>
+              </li>
               <li class="nav-item">
                 <a class="nav-link" href="jsons.html">
                   <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-file-text">
@@ -165,25 +177,6 @@
             <img src="error_events_past_year.png" class="img-fluid" alt="Responsive image">
           </div>
 
-          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
-            <img src="risky_events_past_hour.png" class="img-fluid" alt="Responsive image">
-          </div>
-          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
-            <img src="risky_events_past_12hours.png" class="img-fluid" alt="Responsive image">
-          </div>
-          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
-            <img src="risky_events_past_day.png" class="img-fluid" alt="Responsive image">
-          </div>
-          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
-            <img src="risky_events_past_week.png" class="img-fluid" alt="Responsive image">
-          </div>
-          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
-            <img src="risky_events_past_month.png" class="img-fluid" alt="Responsive image">
-          </div>
-          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
-            <img src="risky_events_past_year.png" class="img-fluid" alt="Responsive image">
-          </div>
-
         </main>
       </div>
     </div>
diff --git a/examples/c-collectd/www/dpi/flows.html b/examples/c-collectd/www/dpi/flows.html
index 1f7841328..91fce11b2 100644
--- a/examples/c-collectd/www/dpi/flows.html
+++ b/examples/c-collectd/www/dpi/flows.html
@@ -97,6 +97,18 @@
                   Categories
                 </a>
               </li>
+              <li class="nav-item">
+                <a class="nav-link" href="risks.html">
+                  <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-file-text">
+                    <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"></path>
+                    <polyline points="14 2 14 8 20 8"></polyline>
+                    <line x1="16" y1="13" x2="8" y2="13"></line>
+                    <line x1="16" y1="17" x2="8" y2="17"></line>
+                    <polyline points="10 9 9 9 8 9"></polyline>
+                  </svg>
+                  Risks
+                </a>
+              </li>
               <li class="nav-item">
                 <a class="nav-link" href="jsons.html">
                   <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-file-text">
diff --git a/examples/c-collectd/www/dpi/index.html b/examples/c-collectd/www/dpi/index.html
index bcec4ea3b..0a04c68aa 100644
--- a/examples/c-collectd/www/dpi/index.html
+++ b/examples/c-collectd/www/dpi/index.html
@@ -97,6 +97,18 @@
                   Categories
                 </a>
               </li>
+              <li class="nav-item">
+                <a class="nav-link" href="risks.html">
+                  <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-file-text">
+                    <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"></path>
+                    <polyline points="14 2 14 8 20 8"></polyline>
+                    <line x1="16" y1="13" x2="8" y2="13"></line>
+                    <line x1="16" y1="17" x2="8" y2="17"></line>
+                    <polyline points="10 9 9 9 8 9"></polyline>
+                  </svg>
+                  Risks
+                </a>
+              </li>
               <li class="nav-item">
                 <a class="nav-link" href="jsons.html">
                   <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-file-text">
@@ -165,6 +177,25 @@
             <img src="detections_past_year.png" class="img-fluid" alt="Responsive image">
           </div>
 
+          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
+            <img src="confidence_past_hour.png" class="img-fluid" alt="Responsive image">
+          </div>
+          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
+            <img src="confidence_past_12hours.png" class="img-fluid" alt="Responsive image">
+          </div>
+          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
+            <img src="confidence_past_day.png" class="img-fluid" alt="Responsive image">
+          </div>
+          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
+            <img src="confidence_past_week.png" class="img-fluid" alt="Responsive image">
+          </div>
+          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
+            <img src="confidence_past_month.png" class="img-fluid" alt="Responsive image">
+          </div>
+          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
+            <img src="confidence_past_year.png" class="img-fluid" alt="Responsive image">
+          </div>
+
           <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
             <img src="traffic_past_hour.png" class="img-fluid" alt="Responsive image">
           </div>
@@ -336,6 +367,25 @@
             <img src="json_bytes_past_year.png" class="img-fluid" alt="Responsive image">
           </div>
 
+          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
+            <img src="severities_past_hour.png" class="img-fluid" alt="Responsive image">
+          </div>
+          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
+            <img src="severities_past_12hours.png" class="img-fluid" alt="Responsive image">
+          </div>
+          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
+            <img src="severities_past_day.png" class="img-fluid" alt="Responsive image">
+          </div>
+          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
+            <img src="severities_past_week.png" class="img-fluid" alt="Responsive image">
+          </div>
+          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
+            <img src="severities_past_month.png" class="img-fluid" alt="Responsive image">
+          </div>
+          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
+            <img src="severities_past_year.png" class="img-fluid" alt="Responsive image">
+          </div>
+
           <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
             <img src="risky_events_past_hour.png" class="img-fluid" alt="Responsive image">
           </div>
diff --git a/examples/c-collectd/www/dpi/jsons.html b/examples/c-collectd/www/dpi/jsons.html
index bb8006c42..4381c68c2 100644
--- a/examples/c-collectd/www/dpi/jsons.html
+++ b/examples/c-collectd/www/dpi/jsons.html
@@ -97,6 +97,18 @@
                   Categories
                 </a>
               </li>
+              <li class="nav-item">
+                <a class="nav-link" href="risks.html">
+                  <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-file-text">
+                    <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"></path>
+                    <polyline points="14 2 14 8 20 8"></polyline>
+                    <line x1="16" y1="13" x2="8" y2="13"></line>
+                    <line x1="16" y1="17" x2="8" y2="17"></line>
+                    <polyline points="10 9 9 9 8 9"></polyline>
+                  </svg>
+                  Risks
+                </a>
+              </li>
               <li class="nav-item">
                 <a class="nav-link active" href="jsons.html">
                   <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-file-text">
diff --git a/examples/c-collectd/www/dpi/other.html b/examples/c-collectd/www/dpi/other.html
index e4e4156da..2ba9e060c 100644
--- a/examples/c-collectd/www/dpi/other.html
+++ b/examples/c-collectd/www/dpi/other.html
@@ -97,6 +97,18 @@
                   Categories
                 </a>
               </li>
+              <li class="nav-item">
+                <a class="nav-link" href="risks.html">
+                  <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-file-text">
+                    <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"></path>
+                    <polyline points="14 2 14 8 20 8"></polyline>
+                    <line x1="16" y1="13" x2="8" y2="13"></line>
+                    <line x1="16" y1="17" x2="8" y2="17"></line>
+                    <polyline points="10 9 9 9 8 9"></polyline>
+                  </svg>
+                  Risks
+                </a>
+              </li>
               <li class="nav-item">
                 <a class="nav-link" href="jsons.html">
                   <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-file-text">
diff --git a/examples/c-collectd/www/dpi/risks.html b/examples/c-collectd/www/dpi/risks.html
new file mode 100644
index 000000000..f8f6bf9c8
--- /dev/null
+++ b/examples/c-collectd/www/dpi/risks.html
@@ -0,0 +1,198 @@
+<!DOCTYPE html>
+<html lang="en"><head>
+    <meta http-equiv="cache-control" content="max-age=0" />
+    <meta http-equiv="cache-control" content="no-cache" />
+    <meta http-equiv="expires" content="0" />
+    <meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT" />
+    <meta http-equiv="pragma" content="no-cache" />
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta name="description" content="nDPId RRD Graph">
+    <meta name="author" content="Toni Uhlig">
+    <link rel="icon" href="https://getbootstrap.com/docs/4.0/assets/img/favicons/favicon.ico">
+
+    <title>nDPId Dashboard</title>
+
+    <link rel="canonical" href="https://getbootstrap.com/docs/4.0/examples/dashboard/">
+
+    <!-- Bootstrap core CSS -->
+    <link href="bootstrap.css" rel="stylesheet">
+
+    <!-- Custom styles for this template -->
+    <link href="dashboard.css" rel="stylesheet">
+  </head>
+
+  <body>
+    <nav class="navbar navbar-dark sticky-top bg-dark flex-md-nowrap p-0">
+      <a class="navbar-brand col-sm-3 col-md-2 mr-0" href="https://github.com/utoni/nDPId">nDPId Collectd RRD Graph</a>
+    </nav>
+
+    <div class="container-fluid">
+      <div class="row">
+        <nav class="col-md-2 d-none d-md-block bg-light sidebar">
+          <div class="sidebar-sticky">
+
+            <h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted">
+              <span>Graphs</span>
+            </h6>
+
+            <ul class="nav flex-column mb-2">
+              <li class="nav-item">                                                                                                                                                                                 
+                <a class="nav-link" href="index.html">
+                  <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-file-text">
+                    <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"></path>
+                    <polyline points="14 2 14 8 20 8"></polyline>
+                    <line x1="16" y1="13" x2="8" y2="13"></line>
+                    <line x1="16" y1="17" x2="8" y2="17"></line>
+                    <polyline points="10 9 9 9 8 9"></polyline>
+                  </svg>
+                  Home
+                </a>
+              </li>
+              <li class="nav-item">
+                <a class="nav-link" href="flows.html">
+                  <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-file-text">
+                    <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"></path>
+                    <polyline points="14 2 14 8 20 8"></polyline>
+                    <line x1="16" y1="13" x2="8" y2="13"></line>
+                    <line x1="16" y1="17" x2="8" y2="17"></line><polyline points="10 9 9 9 8 9"></polyline>
+                  </svg>
+                  Flows
+                </a>
+              </li>
+              <li class="nav-item">
+                <a class="nav-link" href="other.html">
+                  <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-file-text"> 
+                    <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"></path>
+                    <polyline points="14 2 14 8 20 8"></polyline>
+                    <line x1="16" y1="13" x2="8" y2="13"></line>
+                    <line x1="16" y1="17" x2="8" y2="17"></line>
+                    <polyline points="10 9 9 9 8 9"></polyline>
+                  </svg>
+                  Other
+                </a>
+              </li>
+              <li class="nav-item">
+                <a class="nav-link" href="detections.html">
+                  <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-file-text">
+                    <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"></path>
+                    <polyline points="14 2 14 8 20 8"></polyline>
+                    <line x1="16" y1="13" x2="8" y2="13"></line>
+                    <line x1="16" y1="17" x2="8" y2="17"></line>
+                    <polyline points="10 9 9 9 8 9"></polyline>
+                  </svg>
+                  Detections
+                </a>
+              </li>
+              <li class="nav-item">
+                <a class="nav-link" href="categories.html">
+                  <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-file-text">
+                    <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"></path>
+                    <polyline points="14 2 14 8 20 8"></polyline>
+                    <line x1="16" y1="13" x2="8" y2="13"></line>
+                    <line x1="16" y1="17" x2="8" y2="17"></line>
+                    <polyline points="10 9 9 9 8 9"></polyline>
+                  </svg>
+                  Categories
+                </a>
+              </li>
+              <li class="nav-item">
+                <a class="nav-link active" href="risks.html">
+                  <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-file-text">
+                    <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"></path>
+                    <polyline points="14 2 14 8 20 8"></polyline>
+                    <line x1="16" y1="13" x2="8" y2="13"></line>
+                    <line x1="16" y1="17" x2="8" y2="17"></line>
+                    <polyline points="10 9 9 9 8 9"></polyline>
+                  </svg>
+                  Risks
+                </a>
+              </li>
+              <li class="nav-item">
+                <a class="nav-link" href="jsons.html">
+                  <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-file-text">
+                    <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"></path>
+                    <polyline points="14 2 14 8 20 8"></polyline>
+                    <line x1="16" y1="13" x2="8" y2="13"></line>
+                    <line x1="16" y1="17" x2="8" y2="17"></line>
+                    <polyline points="10 9 9 9 8 9"></polyline>
+                  </svg>
+                  JSONs
+                </a>
+              </li>
+              <li class="nav-item">
+                <a class="nav-link" href="events.html">
+                  <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-file-text">
+                    <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"></path>
+                    <polyline points="14 2 14 8 20 8"></polyline>
+                    <line x1="16" y1="13" x2="8" y2="13"></line>
+                    <line x1="16" y1="17" x2="8" y2="17"></line>
+                    <polyline points="10 9 9 9 8 9"></polyline>
+                  </svg>
+                  Events
+                </a>
+              </li>
+            </ul>
+          </div>
+        </nav>
+
+        <main role="main" class="col-md-9 ml-sm-auto col-lg-10 pt-3 px-4">
+
+          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
+            <img src="severities_past_hour.png" class="img-fluid" alt="Responsive image">
+          </div>
+          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
+            <img src="severities_past_12hours.png" class="img-fluid" alt="Responsive image">
+          </div>
+          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
+            <img src="severities_past_day.png" class="img-fluid" alt="Responsive image">
+          </div>
+          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
+            <img src="severities_past_week.png" class="img-fluid" alt="Responsive image">
+          </div>
+          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
+            <img src="severities_past_month.png" class="img-fluid" alt="Responsive image">
+          </div>
+          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
+            <img src="severities_past_year.png" class="img-fluid" alt="Responsive image">
+          </div>
+
+          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
+            <img src="risky_events_past_hour.png" class="img-fluid" alt="Responsive image">
+          </div>
+          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
+            <img src="risky_events_past_12hours.png" class="img-fluid" alt="Responsive image">
+          </div>
+          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
+            <img src="risky_events_past_day.png" class="img-fluid" alt="Responsive image">
+          </div>
+          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
+            <img src="risky_events_past_week.png" class="img-fluid" alt="Responsive image">
+          </div>
+          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
+            <img src="risky_events_past_month.png" class="img-fluid" alt="Responsive image">
+          </div>
+          <div class="d-flex justify-content-center flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
+            <img src="risky_events_past_year.png" class="img-fluid" alt="Responsive image">
+          </div>
+
+        </main>
+      </div>
+    </div>
+
+    <!-- Bootstrap core JavaScript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <script src="jquery-3.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
+    <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
+    <script src="popper.js"></script>
+    <script src="bootstrap.js"></script>
+
+    <!-- Icons -->
+    <script src="feather.js"></script>
+    <script>
+      feather.replace()
+    </script>
+
+</body></html>
diff --git a/test/results/stats/caches_cfg/ookla.pcap.out b/test/results/stats/caches_cfg/ookla.pcap.out
index 6019f8a70..2821b5d32 100644
--- a/test/results/stats/caches_cfg/ookla.pcap.out
+++ b/test/results/stats/caches_cfg/ookla.pcap.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:56
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:43459
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:22919
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:9629
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:30
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:56
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:43459
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:22732
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:8117
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:30
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -133,8 +158,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_51_count" interval=60 N:0
diff --git a/test/results/stats/caches_cfg/teams.pcap.out b/test/results/stats/caches_cfg/teams.pcap.out
index 0e7b01f2d..0f85ff89c 100644
--- a/test/results/stats/caches_cfg/teams.pcap.out
+++ b/test/results/stats/caches_cfg/teams.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:674
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:637423
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:83
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:17
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:66
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:16
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:80
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:57
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:293772
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:293323
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:27
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:16
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:317
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:83
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:53
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:674
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:637423
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:83
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:66
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:80
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:57
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:293772
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:293323
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:27
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:317
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:42
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:37
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -36,12 +54,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interv
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:24
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:20
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:19
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:52
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:39
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:27
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:19
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:74
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:38
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:83
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,41 +108,26 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:40
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:16
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:16
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:83
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:80
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:10
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:33
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:33
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
@@ -129,14 +154,14 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_51_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_52_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_53_count" interval=60 N:0
diff --git a/test/results/stats/default/1kxun.pcap.out b/test/results/stats/default/1kxun.pcap.out
index 2435a07fd..0204904e7 100644
--- a/test/results/stats/default/1kxun.pcap.out
+++ b/test/results/stats/default/1kxun.pcap.out
@@ -1,56 +1,79 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:1303
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:1542432
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:197
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:188
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:38
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:177
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:33
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:167344
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:2271410
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:35
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:624
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:157
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:72
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:1303
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:1542432
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:197
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:188
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:38
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:177
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:33
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:156501
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:2270815
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:35
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:624
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:116
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:53
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:56
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:39
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:96
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:63
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:46
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:34
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:45
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:22
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:2
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:177
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:34
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:172
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:25
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,48 +108,33 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:99
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:197
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:177
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:14
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:13
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
@@ -125,15 +150,15 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_35_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_36_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_37_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_38_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:13
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/443-chrome.pcap.out b/test/results/stats/default/443-chrome.pcap.out
index 4fb6e71a1..14b591675 100644
--- a/test/results/stats/default/443-chrome.pcap.out
+++ b/test/results/stats/default/443-chrome.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:7029
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1440
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:7029
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1440
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/443-curl.pcap.out b/test/results/stats/default/443-curl.pcap.out
index ab3ce412a..c48ae2691 100644
--- a/test/results/stats/default/443-curl.pcap.out
+++ b/test/results/stats/default/443-curl.pcap.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:13054
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:930
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:65886
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:13054
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:930
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:65886
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/443-firefox.pcap.out b/test/results/stats/default/443-firefox.pcap.out
index 14aefe50a..8a8605164 100644
--- a/test/results/stats/default/443-firefox.pcap.out
+++ b/test/results/stats/default/443-firefox.pcap.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:13302
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:7675
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:406398
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:13302
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:7675
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:406398
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/443-git.pcap.out b/test/results/stats/default/443-git.pcap.out
index c784dde5e..bb756c507 100644
--- a/test/results/stats/default/443-git.pcap.out
+++ b/test/results/stats/default/443-git.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:15107
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:881
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:31704
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:15107
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:881
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:31704
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -41,7 +59,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/443-opvn.pcap.out b/test/results/stats/default/443-opvn.pcap.out
index 63c26f829..2d9d1eecb 100644
--- a/test/results/stats/default/443-opvn.pcap.out
+++ b/test/results/stats/default/443-opvn.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:9621
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:3974
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:4543
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:9621
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:3974
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:4543
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/443-safari.pcap.out b/test/results/stats/default/443-safari.pcap.out
index 1b0b83712..de169abfa 100644
--- a/test/results/stats/default/443-safari.pcap.out
+++ b/test/results/stats/default/443-safari.pcap.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:12813
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:797
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:16406
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:12813
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:797
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:16406
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/4in4tunnel.pcap.out b/test/results/stats/default/4in4tunnel.pcap.out
index 598341bfd..3197756e2 100644
--- a/test/results/stats/default/4in4tunnel.pcap.out
+++ b/test/results/stats/default/4in4tunnel.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:17
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:8620
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:8620
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/4in6tunnel.pcap.out b/test/results/stats/default/4in6tunnel.pcap.out
index 820d68c5a..6a6a99a3d 100644
--- a/test/results/stats/default/4in6tunnel.pcap.out
+++ b/test/results/stats/default/4in6tunnel.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:9398
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:316
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1464
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:9398
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:316
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1464
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/6in4tunnel.pcap.out b/test/results/stats/default/6in4tunnel.pcap.out
index b64e6984c..f7b0e293f 100644
--- a/test/results/stats/default/6in4tunnel.pcap.out
+++ b/test/results/stats/default/6in4tunnel.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:9749
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:11600
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:24375
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:9749
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:11600
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:24375
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/6in6tunnel.pcap.out b/test/results/stats/default/6in6tunnel.pcap.out
index 9e72e7c89..2f4370a0e 100644
--- a/test/results/stats/default/6in6tunnel.pcap.out
+++ b/test/results/stats/default/6in6tunnel.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:8145
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:104
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:8145
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:104
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/BGP_Cisco_hdlc_slarp.pcap.out b/test/results/stats/default/BGP_Cisco_hdlc_slarp.pcap.out
index fdca9e07b..5fc9990ac 100644
--- a/test/results/stats/default/BGP_Cisco_hdlc_slarp.pcap.out
+++ b/test/results/stats/default/BGP_Cisco_hdlc_slarp.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:7389
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:76
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:269
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:7389
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:76
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:269
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/BGP_redist.pcap.out b/test/results/stats/default/BGP_redist.pcap.out
index 607709b55..edb4e6ea1 100644
--- a/test/results/stats/default/BGP_redist.pcap.out
+++ b/test/results/stats/default/BGP_redist.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:6099
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:115
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:6099
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:115
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/EAQ.pcap.out b/test/results/stats/default/EAQ.pcap.out
index 62bb2b355..402f313ad 100644
--- a/test/results/stats/default/EAQ.pcap.out
+++ b/test/results/stats/default/EAQ.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:269
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:193278
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:31
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:29
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:29
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:31
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:2383
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:10862
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:23
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:144
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:269
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:193278
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:31
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:29
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:29
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:31
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:2383
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:10862
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:23
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:144
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:39
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:31
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:37
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:29
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:31
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:31
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:29
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:31
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:31
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -97,8 +122,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:21
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:21
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/FAX-Call-t38-CA-TDM-SIP-FB-1.pcap.out b/test/results/stats/default/FAX-Call-t38-CA-TDM-SIP-FB-1.pcap.out
index a54f6accd..8684691e1 100644
--- a/test/results/stats/default/FAX-Call-t38-CA-TDM-SIP-FB-1.pcap.out
+++ b/test/results/stats/default/FAX-Call-t38-CA-TDM-SIP-FB-1.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:52
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:54932
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:56781
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:136335
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:25
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:52
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:54932
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:56781
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:136335
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:25
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,7 +44,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
@@ -36,7 +54,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interv
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/IEC104.pcap.out b/test/results/stats/default/IEC104.pcap.out
index 64fa29f31..30b2909a9 100644
--- a/test/results/stats/default/IEC104.pcap.out
+++ b/test/results/stats/default/IEC104.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:17
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:12099
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:609
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:12099
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:609
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/KakaoTalk_chat.pcap.out b/test/results/stats/default/KakaoTalk_chat.pcap.out
index b3dd53747..8f579c3a1 100644
--- a/test/results/stats/default/KakaoTalk_chat.pcap.out
+++ b/test/results/stats/default/KakaoTalk_chat.pcap.out
@@ -1,46 +1,64 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:270
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:237305
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:38
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:30
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:33
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:33
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:15862
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:36150
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:116
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:33
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:270
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:237305
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:38
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:30
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:33
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:33
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:15862
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:36150
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:116
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:38
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:19
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:33
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:38
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,41 +108,26 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:18
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:38
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:33
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:9
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/KakaoTalk_talk.pcap.out b/test/results/stats/default/KakaoTalk_talk.pcap.out
index c749960f9..dc9cce833 100644
--- a/test/results/stats/default/KakaoTalk_talk.pcap.out
+++ b/test/results/stats/default/KakaoTalk_talk.pcap.out
@@ -1,46 +1,64 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:144
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:119885
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:20
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:146910
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:144494
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:73
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:144
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:119885
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:146910
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:144494
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:73
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:20
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,34 +108,19 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
diff --git a/test/results/stats/default/NTPv2.pcap.out b/test/results/stats/default/NTPv2.pcap.out
index 94209cbd9..1024f68bf 100644
--- a/test/results/stats/default/NTPv2.pcap.out
+++ b/test/results/stats/default/NTPv2.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:5567
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:368
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:5567
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:368
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/NTPv3.pcap.out b/test/results/stats/default/NTPv3.pcap.out
index 0e9e00c91..08638bb21 100644
--- a/test/results/stats/default/NTPv3.pcap.out
+++ b/test/results/stats/default/NTPv3.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:5127
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:48
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:5127
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:48
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/NTPv4.pcap.out b/test/results/stats/default/NTPv4.pcap.out
index 0e9e00c91..08638bb21 100644
--- a/test/results/stats/default/NTPv4.pcap.out
+++ b/test/results/stats/default/NTPv4.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:5127
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:48
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:5127
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:48
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/Oscar.pcap.out b/test/results/stats/default/Oscar.pcap.out
index 578aaf6ad..83db24e9a 100644
--- a/test/results/stats/default/Oscar.pcap.out
+++ b/test/results/stats/default/Oscar.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:9659
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1504
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:3946
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:9659
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1504
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:3946
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/TivoDVR.pcap.out b/test/results/stats/default/TivoDVR.pcap.out
index ad241aa6f..2bc9356d7 100644
--- a/test/results/stats/default/TivoDVR.pcap.out
+++ b/test/results/stats/default/TivoDVR.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:6240
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:334
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:6240
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:334
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:1
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/WebattackRCE.pcap.out b/test/results/stats/default/WebattackRCE.pcap.out
index 07fa32bf2..c97cfe0b7 100644
--- a/test/results/stats/default/WebattackRCE.pcap.out
+++ b/test/results/stats/default/WebattackRCE.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:3191
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:3379226
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:797
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:797
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:797
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:138401
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:797
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:797
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:3191
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:3379226
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:797
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:797
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:797
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:138401
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:797
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:797
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:797
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:797
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:778
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:797
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:62
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:797
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,38 +108,23 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:797
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:797
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:797
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:797
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:62
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:777
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:62
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:777
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
@@ -126,12 +151,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_36_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_37_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_38_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
diff --git a/test/results/stats/default/WebattackSQLinj.pcap.out b/test/results/stats/default/WebattackSQLinj.pcap.out
index 73be35107..dbd5565bf 100644
--- a/test/results/stats/default/WebattackSQLinj.pcap.out
+++ b/test/results/stats/default/WebattackSQLinj.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:75
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:65861
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:4839
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:18821
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:45
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:75
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:65861
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:4839
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:18821
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:45
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:9
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:9
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -98,10 +123,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:9
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
diff --git a/test/results/stats/default/WebattackXSS.pcap.out b/test/results/stats/default/WebattackXSS.pcap.out
index 9d57b16f9..906b903d1 100644
--- a/test/results/stats/default/WebattackXSS.pcap.out
+++ b/test/results/stats/default/WebattackXSS.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:5305
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:3632321
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:661
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:657
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:19
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:639
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:22
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:857367
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:3234521
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:22
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:3299
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:5305
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:3632321
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:661
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:657
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:19
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:639
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:22
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:857367
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:3234521
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:22
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:3299
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:22
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:22
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:22
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:22
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:661
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:661
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:22
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:639
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -98,10 +123,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:22
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:22
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:22
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:22
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
diff --git a/test/results/stats/default/activision.pcap.out b/test/results/stats/default/activision.pcap.out
index 0642cd85c..e93d9701d 100644
--- a/test/results/stats/default/activision.pcap.out
+++ b/test/results/stats/default/activision.pcap.out
@@ -1,32 +1,50 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:38
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:26032
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:620
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:764
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:20
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:38
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:26032
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:620
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:764
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -34,7 +52,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interva
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/adult_content.pcap.out b/test/results/stats/default/adult_content.pcap.out
index 40a536ba9..9bb02f161 100644
--- a/test/results/stats/default/adult_content.pcap.out
+++ b/test/results/stats/default/adult_content.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:9099
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:3131
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:3791
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:9099
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:3131
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:3791
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
diff --git a/test/results/stats/default/afp.pcap.out b/test/results/stats/default/afp.pcap.out
index b84525254..da92eb9f0 100644
--- a/test/results/stats/default/afp.pcap.out
+++ b/test/results/stats/default/afp.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:7383
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:44
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:118
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:7383
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:44
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:118
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/agora-sd-rtn.pcap.out b/test/results/stats/default/agora-sd-rtn.pcap.out
index cca3bc7fd..5d1b5af37 100644
--- a/test/results/stats/default/agora-sd-rtn.pcap.out
+++ b/test/results/stats/default/agora-sd-rtn.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:238
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:225885
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:26
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:26
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:23
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:26
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:54495
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:40944
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:130
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:238
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:225885
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:26
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:26
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:23
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:26
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:54495
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:40944
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:130
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:49
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:26
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,7 +44,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:49
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:26
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:26
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:26
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:26
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:26
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:26
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/ah.pcapng.out b/test/results/stats/default/ah.pcapng.out
index 848ad5e85..62c4a8b68 100644
--- a/test/results/stats/default/ah.pcapng.out
+++ b/test/results/stats/default/ah.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:12172
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:790
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:742
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:12172
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:790
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:742
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/ajp.pcap.out b/test/results/stats/default/ajp.pcap.out
index c777774a8..2dc2e1da4 100644
--- a/test/results/stats/default/ajp.pcap.out
+++ b/test/results/stats/default/ajp.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:43
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:23820
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:2112
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:482
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:43
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:23820
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:2112
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:482
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/alexa-app.pcapng.out b/test/results/stats/default/alexa-app.pcapng.out
index e41715f4f..aa72317d7 100644
--- a/test/results/stats/default/alexa-app.pcapng.out
+++ b/test/results/stats/default/alexa-app.pcapng.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:1415
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:1259545
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:160
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:104
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:56
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:77
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:23
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:146
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:143
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:399153
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:588052
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:61
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:679
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:351
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:1415
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:1259545
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:160
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:104
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:56
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:77
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:23
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:146
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:143
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:399153
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:588052
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:61
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:679
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:138
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:173
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:85
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -39,18 +57,23 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:34
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:147
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:39
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:146
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:25
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:59
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:156
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,41 +108,26 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:33
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:160
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:146
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:51
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:51
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:24
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:24
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
@@ -110,8 +135,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
@@ -129,8 +154,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
diff --git a/test/results/stats/default/alicloud.pcap.out b/test/results/stats/default/alicloud.pcap.out
index 8bcbe5da6..62be6829b 100644
--- a/test/results/stats/default/alicloud.pcap.out
+++ b/test/results/stats/default/alicloud.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:135
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:92446
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:5696
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:2176
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:75
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:135
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:92446
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:5696
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:2176
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:75
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:15
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:15
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/among_us.pcap.out b/test/results/stats/default/among_us.pcap.out
index 407ea23ab..dadafb3b7 100644
--- a/test/results/stats/default/among_us.pcap.out
+++ b/test/results/stats/default/among_us.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:5051
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:5051
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:1
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/amqp.pcap.out b/test/results/stats/default/amqp.pcap.out
index e56c9f582..a89f16fcd 100644
--- a/test/results/stats/default/amqp.pcap.out
+++ b/test/results/stats/default/amqp.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:28
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:23192
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:12849
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:105
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:28
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:23192
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:12849
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:105
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/android.pcap.out b/test/results/stats/default/android.pcap.out
index 843407b62..23375d2f4 100644
--- a/test/results/stats/default/android.pcap.out
+++ b/test/results/stats/default/android.pcap.out
@@ -1,37 +1,55 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:437
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:372630
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:63
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:54
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:60
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:45
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:25482
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:76498
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:196
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:17
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:65
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:26
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:437
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:372630
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:63
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:54
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:60
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:45
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:25482
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:76498
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:196
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:36
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:14
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:37
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:19
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -39,18 +57,23 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:52
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:30
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:60
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:58
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:31
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:63
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:60
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -101,8 +126,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:11
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/anyconnect-vpn.pcap.out b/test/results/stats/default/anyconnect-vpn.pcap.out
index c9e4b65bc..2b725b18f 100644
--- a/test/results/stats/default/anyconnect-vpn.pcap.out
+++ b/test/results/stats/default/anyconnect-vpn.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:457
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:385288
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:69
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:59
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:61
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:34
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:38688
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:56727
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:18
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:207
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:21
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:77
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:457
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:385288
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:69
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:59
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:61
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:34
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:38688
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:56727
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:18
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:207
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:49
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:13
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -40,8 +58,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:63
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:35
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:10
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:61
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:66
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,50 +108,35 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:37
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:69
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:61
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:11
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
@@ -127,10 +152,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_37_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_38_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
@@ -138,5 +163,5 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_51_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_52_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_53_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_52_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_53_count" interval=60 N:6
diff --git a/test/results/stats/default/anydesk.pcapng.out b/test/results/stats/default/anydesk.pcapng.out
index b8ce7c421..07eb4f319 100644
--- a/test/results/stats/default/anydesk.pcapng.out
+++ b/test/results/stats/default/anydesk.pcapng.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:66
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:64887
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:19883
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:15955
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:29
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:66
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:64887
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:19883
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:15955
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:29
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,20 +44,21 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,41 +108,26 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
@@ -110,15 +135,15 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:9
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_29_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_30_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_31_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_32_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_30_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_31_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_32_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_33_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_34_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_35_count" interval=60 N:0
diff --git a/test/results/stats/default/avast.pcap.out b/test/results/stats/default/avast.pcap.out
index a7619334d..5803106bd 100644
--- a/test/results/stats/default/avast.pcap.out
+++ b/test/results/stats/default/avast.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:101
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:68497
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1031
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:246
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:50
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:19
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:101
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:68497
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1031
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:246
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:50
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:19
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:10
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:10
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/avast_securedns.pcapng.out b/test/results/stats/default/avast_securedns.pcapng.out
index 4edadaf31..e1f6060ae 100644
--- a/test/results/stats/default/avast_securedns.pcapng.out
+++ b/test/results/stats/default/avast_securedns.pcapng.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:218
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:177843
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:39
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:39
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:39
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1521
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:6688
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:77
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:48
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:218
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:177843
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:39
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:39
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:39
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1521
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:6688
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:77
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:39
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:48
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:39
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:39
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:39
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:39
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:39
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:39
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/bacnet.pcap.out b/test/results/stats/default/bacnet.pcap.out
index 48aa27f80..13ddf5384 100644
--- a/test/results/stats/default/bacnet.pcap.out
+++ b/test/results/stats/default/bacnet.pcap.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:57
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:44580
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:398
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:57
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:44580
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:398
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:10
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:10
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:10
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/bad-dns-traffic.pcap.out b/test/results/stats/default/bad-dns-traffic.pcap.out
index a6a3d79ae..2c0751a53 100644
--- a/test/results/stats/default/bad-dns-traffic.pcap.out
+++ b/test/results/stats/default/bad-dns-traffic.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:39
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:40391
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:44399
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:38931
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:39
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:40391
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:44399
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:38931
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -102,19 +127,19 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_29_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_30_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_31_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/badpackets.pcap.out b/test/results/stats/default/badpackets.pcap.out
index 47e66896e..64a9edee1 100644
--- a/test/results/stats/default/badpackets.pcap.out
+++ b/test/results/stats/default/badpackets.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:194
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:127428
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:95
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:194
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:127428
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:95
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:89
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:95
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:89
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/bets.pcapng.out b/test/results/stats/default/bets.pcapng.out
index 7aac7e198..9a66dda99 100644
--- a/test/results/stats/default/bets.pcapng.out
+++ b/test/results/stats/default/bets.pcapng.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:11297
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:573
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:6919
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:11297
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:573
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:6919
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/bitcoin.pcap.out b/test/results/stats/default/bitcoin.pcap.out
index 3a41ebf16..ceb7b30db 100644
--- a/test/results/stats/default/bitcoin.pcap.out
+++ b/test/results/stats/default/bitcoin.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:58
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:52219
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:112000
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:427032
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:30
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:58
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:52219
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:112000
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:427032
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:30
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/bittorrent.pcap.out b/test/results/stats/default/bittorrent.pcap.out
index f3dd7d50a..613a55c48 100644
--- a/test/results/stats/default/bittorrent.pcap.out
+++ b/test/results/stats/default/bittorrent.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:164
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:148981
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:24
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:24
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:6341
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:279641
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:22
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:88
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:164
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:148981
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:24
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:24
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:6341
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:279641
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:22
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:88
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:24
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,13 +44,14 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:24
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:24
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:24
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:22
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:24
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:24
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:24
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:22
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:22
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
diff --git a/test/results/stats/default/bittorrent_tcp_miss.pcapng.out b/test/results/stats/default/bittorrent_tcp_miss.pcapng.out
index 3ad47631e..33a02c847 100644
--- a/test/results/stats/default/bittorrent_tcp_miss.pcapng.out
+++ b/test/results/stats/default/bittorrent_tcp_miss.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:10986
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1093
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:90373
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:10986
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1093
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:90373
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,13 +44,14 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
diff --git a/test/results/stats/default/bittorrent_utp.pcap.out b/test/results/stats/default/bittorrent_utp.pcap.out
index 8fb1c93f6..c729c9f2a 100644
--- a/test/results/stats/default/bittorrent_utp.pcap.out
+++ b/test/results/stats/default/bittorrent_utp.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:12943
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:34679
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:3198
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:12943
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:34679
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:3198
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,13 +44,14 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/bjnp.pcap.out b/test/results/stats/default/bjnp.pcap.out
index 47f1d473a..215ac4e6b 100644
--- a/test/results/stats/default/bjnp.pcap.out
+++ b/test/results/stats/default/bjnp.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:43
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:33997
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:160
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:43
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:33997
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:160
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:10
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:10
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:10
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/bot.pcap.out b/test/results/stats/default/bot.pcap.out
index 93557717b..250c742b2 100644
--- a/test/results/stats/default/bot.pcap.out
+++ b/test/results/stats/default/bot.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:10425
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:316
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:406780
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:10425
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:316
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:406780
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -130,8 +155,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
diff --git a/test/results/stats/default/bt-dns.pcap.out b/test/results/stats/default/bt-dns.pcap.out
index 46260f3a9..dc0917f91 100644
--- a/test/results/stats/default/bt-dns.pcap.out
+++ b/test/results/stats/default/bt-dns.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:6065
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:30
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:46
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:6065
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:30
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:46
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/bt-http.pcapng.out b/test/results/stats/default/bt-http.pcapng.out
index cc85b3883..9e80b9908 100644
--- a/test/results/stats/default/bt-http.pcapng.out
+++ b/test/results/stats/default/bt-http.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:8645
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:370
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:340
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:8645
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:370
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:340
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,13 +44,14 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/bt_search.pcap.out b/test/results/stats/default/bt_search.pcap.out
index 0a06866b8..075b9d4ad 100644
--- a/test/results/stats/default/bt_search.pcap.out
+++ b/test/results/stats/default/bt_search.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:5970
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:238
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:5970
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:238
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,13 +44,14 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/cachefly.pcapng.out b/test/results/stats/default/cachefly.pcapng.out
index abf7f94e7..dc4d06481 100644
--- a/test/results/stats/default/cachefly.pcapng.out
+++ b/test/results/stats/default/cachefly.pcapng.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:17729
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:5242
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:517
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:17729
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:5242
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:517
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -39,7 +57,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/can.pcap.out b/test/results/stats/default/can.pcap.out
index e68723751..37593e882 100644
--- a/test/results/stats/default/can.pcap.out
+++ b/test/results/stats/default/can.pcap.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:36
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:29211
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:360
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:36
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:29211
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:360
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -44,13 +62,18 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/capwap.pcap.out b/test/results/stats/default/capwap.pcap.out
index b5a277f2b..d6bdbc297 100644
--- a/test/results/stats/default/capwap.pcap.out
+++ b/test/results/stats/default/capwap.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:70
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:56300
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:48656
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:33179
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:17
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:70
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:56300
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:48656
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:33179
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/capwap_data.pcapng.out b/test/results/stats/default/capwap_data.pcapng.out
index 1212c55f3..1f7fc190f 100644
--- a/test/results/stats/default/capwap_data.pcapng.out
+++ b/test/results/stats/default/capwap_data.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:31
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:14083
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:31
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:14083
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/cassandra.pcap.out b/test/results/stats/default/cassandra.pcap.out
index a75391539..d02651f1c 100644
--- a/test/results/stats/default/cassandra.pcap.out
+++ b/test/results/stats/default/cassandra.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:21
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:17294
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:9735
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:97373
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:17294
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:9735
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:97373
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/check_mk_new.pcap.out b/test/results/stats/default/check_mk_new.pcap.out
index 196a5005c..9bda5c1a3 100644
--- a/test/results/stats/default/check_mk_new.pcap.out
+++ b/test/results/stats/default/check_mk_new.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:9569
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:13758
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:9569
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:13758
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/chrome.pcap.out b/test/results/stats/default/chrome.pcap.out
index 8d0a6cb92..ffd1a3499 100644
--- a/test/results/stats/default/chrome.pcap.out
+++ b/test/results/stats/default/chrome.pcap.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:57
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:48187
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:8227
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:51402
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:30
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:57
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:48187
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:8227
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:51402
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:30
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/citrix.pcap.out b/test/results/stats/default/citrix.pcap.out
index e23f39a1d..8fb9761b8 100644
--- a/test/results/stats/default/citrix.pcap.out
+++ b/test/results/stats/default/citrix.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:8351
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:3874
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1616
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:8351
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:3874
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1616
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/cloudflare-warp.pcap.out b/test/results/stats/default/cloudflare-warp.pcap.out
index e4c38fee3..025df2975 100644
--- a/test/results/stats/default/cloudflare-warp.pcap.out
+++ b/test/results/stats/default/cloudflare-warp.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:63
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:48442
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:2276
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:6167
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:33
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:63
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:48442
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:2276
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:6167
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:33
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,15 +44,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -101,8 +126,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
diff --git a/test/results/stats/default/coap_mqtt.pcap.out b/test/results/stats/default/coap_mqtt.pcap.out
index e68666ad3..cd2238737 100644
--- a/test/results/stats/default/coap_mqtt.pcap.out
+++ b/test/results/stats/default/coap_mqtt.pcap.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:121
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:102087
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:16
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:16
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:16
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:41887
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:11416
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:58
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:121
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:102087
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:41887
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:11416
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:58
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -42,7 +60,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interva
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:12
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:12
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
diff --git a/test/results/stats/default/collectd.pcap.out b/test/results/stats/default/collectd.pcap.out
index 01b534755..ec281ce10 100644
--- a/test/results/stats/default/collectd.pcap.out
+++ b/test/results/stats/default/collectd.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:74
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:103034
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:110042
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:25
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:74
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:103034
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:105984
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:25
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -44,13 +62,18 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:9
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:9
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/corba.pcap.out b/test/results/stats/default/corba.pcap.out
index 6ae7d957e..04ca01d0c 100644
--- a/test/results/stats/default/corba.pcap.out
+++ b/test/results/stats/default/corba.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:27
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:20639
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1154
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1243
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:27
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:20639
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1154
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1243
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/cpha.pcap.out b/test/results/stats/default/cpha.pcap.out
index 9e47296d8..0d47453f2 100644
--- a/test/results/stats/default/cpha.pcap.out
+++ b/test/results/stats/default/cpha.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:5074
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:50
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:5074
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:50
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:1
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/crawler_false_positive.pcapng.out b/test/results/stats/default/crawler_false_positive.pcapng.out
index 948bca7d2..ac1d7830d 100644
--- a/test/results/stats/default/crawler_false_positive.pcapng.out
+++ b/test/results/stats/default/crawler_false_positive.pcapng.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:8743
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:235
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:799
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:8743
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:235
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:799
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -97,8 +122,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
diff --git a/test/results/stats/default/crynet.pcap.out b/test/results/stats/default/crynet.pcap.out
index e6b58966d..2b3b105ae 100644
--- a/test/results/stats/default/crynet.pcap.out
+++ b/test/results/stats/default/crynet.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:64
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:47540
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:8204
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1463
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:35
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:64
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:47540
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:8204
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1463
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:35
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:7
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/custom_categories.pcapng.out b/test/results/stats/default/custom_categories.pcapng.out
index 6bfc5788c..ef2fcff82 100644
--- a/test/results/stats/default/custom_categories.pcapng.out
+++ b/test/results/stats/default/custom_categories.pcapng.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:30
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:26661
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:2156
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:5216
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:30
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:26661
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:2156
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:5216
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -38,7 +56,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -104,9 +129,9 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
diff --git a/test/results/stats/default/custom_risk_mask.pcapng.out b/test/results/stats/default/custom_risk_mask.pcapng.out
index c995352ad..eb1ed9792 100644
--- a/test/results/stats/default/custom_risk_mask.pcapng.out
+++ b/test/results/stats/default/custom_risk_mask.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:9159
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:60
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:9159
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:60
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -125,8 +150,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_35_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_36_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_37_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_38_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
diff --git a/test/results/stats/default/custom_rules_ipv6.pcapng.out b/test/results/stats/default/custom_rules_ipv6.pcapng.out
index 05de299b3..1637224ef 100644
--- a/test/results/stats/default/custom_rules_ipv6.pcapng.out
+++ b/test/results/stats/default/custom_rules_ipv6.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:26
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:24554
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:3018
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:896
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:26
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:24554
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:2990
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:448
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/custom_rules_same-ip_multiple_ports.pcapng.out b/test/results/stats/default/custom_rules_same-ip_multiple_ports.pcapng.out
index 7822f78a7..3204fc65d 100644
--- a/test/results/stats/default/custom_rules_same-ip_multiple_ports.pcapng.out
+++ b/test/results/stats/default/custom_rules_same-ip_multiple_ports.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:21
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:15313
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:15313
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/dazn.pcapng.out b/test/results/stats/default/dazn.pcapng.out
index 954d2ed80..02896f648 100644
--- a/test/results/stats/default/dazn.pcapng.out
+++ b/test/results/stats/default/dazn.pcapng.out
@@ -1,32 +1,50 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:27
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:29028
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1551
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:4284
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:27
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:29028
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1551
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:4284
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -43,7 +61,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/dcerpc.pcap.out b/test/results/stats/default/dcerpc.pcap.out
index fff3c466b..a6d98c31b 100644
--- a/test/results/stats/default/dcerpc.pcap.out
+++ b/test/results/stats/default/dcerpc.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:29
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:27961
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:6194
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:29
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:27961
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:6194
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/dhcp-fuzz.pcapng.out b/test/results/stats/default/dhcp-fuzz.pcapng.out
index d606a7cd1..64d725c69 100644
--- a/test/results/stats/default/dhcp-fuzz.pcapng.out
+++ b/test/results/stats/default/dhcp-fuzz.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:5395
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:300
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:5395
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:300
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/diameter.pcap.out b/test/results/stats/default/diameter.pcap.out
index 130a74416..6e42100a7 100644
--- a/test/results/stats/default/diameter.pcap.out
+++ b/test/results/stats/default/diameter.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:9248
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1012
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:644
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:9248
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1012
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:644
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/discord.pcap.out b/test/results/stats/default/discord.pcap.out
index c8d05e5f5..1a326f59a 100644
--- a/test/results/stats/default/discord.pcap.out
+++ b/test/results/stats/default/discord.pcap.out
@@ -1,32 +1,50 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:316
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:261994
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:34
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:34
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:57
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:34
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:32475
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:48285
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:149
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:316
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:261994
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:34
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:34
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:57
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:34
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:32475
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:48285
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:149
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:93
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:34
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -41,7 +59,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:93
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:34
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:34
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:34
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:33
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:34
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:34
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -95,8 +120,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
diff --git a/test/results/stats/default/discord_mid_flow.pcap.out b/test/results/stats/default/discord_mid_flow.pcap.out
index 49fefec7c..3ae31b5f9 100644
--- a/test/results/stats/default/discord_mid_flow.pcap.out
+++ b/test/results/stats/default/discord_mid_flow.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:35
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:14082
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:16
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:35
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:14082
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:16
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:16
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/dlt_ppp.pcap.out b/test/results/stats/default/dlt_ppp.pcap.out
index 359ec151e..2571e24a5 100644
--- a/test/results/stats/default/dlt_ppp.pcap.out
+++ b/test/results/stats/default/dlt_ppp.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:3444
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:3444
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/dnp3.pcap.out b/test/results/stats/default/dnp3.pcap.out
index 40f81f2c1..a7598503d 100644
--- a/test/results/stats/default/dnp3.pcap.out
+++ b/test/results/stats/default/dnp3.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:81
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:64293
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:2559
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:5229
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:40
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:81
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:64293
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:2559
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:5229
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:40
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/dns-exf.pcap.out b/test/results/stats/default/dns-exf.pcap.out
index 53a5a3556..ffddfd085 100644
--- a/test/results/stats/default/dns-exf.pcap.out
+++ b/test/results/stats/default/dns-exf.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:8227
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:121
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:137
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:8227
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:121
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:137
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -109,8 +134,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
@@ -125,8 +150,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_35_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_36_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_37_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_38_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
@@ -135,8 +160,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_51_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_52_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_53_count" interval=60 N:0
diff --git a/test/results/stats/default/dns-google-nsid.pcapng.out b/test/results/stats/default/dns-google-nsid.pcapng.out
index a06705a77..a0d07d007 100644
--- a/test/results/stats/default/dns-google-nsid.pcapng.out
+++ b/test/results/stats/default/dns-google-nsid.pcapng.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:46
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:40050
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:368
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1054
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:46
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:40050
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:368
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1054
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/dns-invalid-chars.pcap.out b/test/results/stats/default/dns-invalid-chars.pcap.out
index aeb9f79f6..38654359a 100644
--- a/test/results/stats/default/dns-invalid-chars.pcap.out
+++ b/test/results/stats/default/dns-invalid-chars.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:7433
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:48
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:64
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:7433
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:48
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:64
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -125,8 +150,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_35_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_36_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_37_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_38_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
diff --git a/test/results/stats/default/dns-tunnel-iodine.pcap.out b/test/results/stats/default/dns-tunnel-iodine.pcap.out
index 459112a91..475d12010 100644
--- a/test/results/stats/default/dns-tunnel-iodine.pcap.out
+++ b/test/results/stats/default/dns-tunnel-iodine.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:11737
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:16812
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:35212
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:11737
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:16812
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:35212
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -109,8 +134,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
@@ -135,8 +160,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_51_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_52_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_53_count" interval=60 N:0
diff --git a/test/results/stats/default/dns2tcp_tunnel.pcap.out b/test/results/stats/default/dns2tcp_tunnel.pcap.out
index 4ec36f274..4783b0e85 100644
--- a/test/results/stats/default/dns2tcp_tunnel.pcap.out
+++ b/test/results/stats/default/dns2tcp_tunnel.pcap.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:12243
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1343
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:4713
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:12243
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1343
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:4713
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -110,8 +135,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
@@ -138,5 +163,5 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_51_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_52_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_53_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_52_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_53_count" interval=60 N:2
diff --git a/test/results/stats/default/dns_ambiguous_names.pcap.out b/test/results/stats/default/dns_ambiguous_names.pcap.out
index 12f2a77b3..bb95c97ce 100644
--- a/test/results/stats/default/dns_ambiguous_names.pcap.out
+++ b/test/results/stats/default/dns_ambiguous_names.pcap.out
@@ -1,32 +1,50 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:63
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:55452
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:509
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1438
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:20
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:63
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:55452
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:509
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1438
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:10
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:10
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:10
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -125,12 +150,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_35_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_36_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_37_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_38_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
diff --git a/test/results/stats/default/dns_doh.pcap.out b/test/results/stats/default/dns_doh.pcap.out
index 5a9bf7914..3119c80d8 100644
--- a/test/results/stats/default/dns_doh.pcap.out
+++ b/test/results/stats/default/dns_doh.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:11714
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:3792
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:8866
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:11714
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:3792
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:8866
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/dns_dot.pcap.out b/test/results/stats/default/dns_dot.pcap.out
index f4a87cea4..4a5e50210 100644
--- a/test/results/stats/default/dns_dot.pcap.out
+++ b/test/results/stats/default/dns_dot.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:10381
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:548
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:3721
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:10381
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:548
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:3721
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -101,8 +126,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
@@ -110,8 +135,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
diff --git a/test/results/stats/default/dns_exfiltration.pcap.out b/test/results/stats/default/dns_exfiltration.pcap.out
index bb3628467..1d87468dc 100644
--- a/test/results/stats/default/dns_exfiltration.pcap.out
+++ b/test/results/stats/default/dns_exfiltration.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:14276
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:26119
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:34826
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:14276
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:26119
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:34826
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -102,8 +127,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
@@ -113,8 +138,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_29_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_30_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_31_count" interval=60 N:0
diff --git a/test/results/stats/default/dns_fragmented.pcap.out b/test/results/stats/default/dns_fragmented.pcap.out
index e5f655c12..5377feee9 100644
--- a/test/results/stats/default/dns_fragmented.pcap.out
+++ b/test/results/stats/default/dns_fragmented.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:153
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:146531
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:21
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:19
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:21
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:22
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1207
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:16654
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:49
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:153
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:146531
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:19
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:22
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1207
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:16654
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:49
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:43
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:21
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:43
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:21
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:16
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:19
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -123,17 +148,17 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_33_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_34_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_35_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_36_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_37_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_38_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_37_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_38_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/dns_invert_query.pcapng.out b/test/results/stats/default/dns_invert_query.pcapng.out
index 422ccb4a1..490874074 100644
--- a/test/results/stats/default/dns_invert_query.pcapng.out
+++ b/test/results/stats/default/dns_invert_query.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:5861
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:36
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:5861
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:36
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/dns_long_domainname.pcap.out b/test/results/stats/default/dns_long_domainname.pcap.out
index 496040135..6fe110166 100644
--- a/test/results/stats/default/dns_long_domainname.pcap.out
+++ b/test/results/stats/default/dns_long_domainname.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:7402
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:61
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:117
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:7402
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:61
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:117
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -129,8 +154,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
diff --git a/test/results/stats/default/dnscrypt-v1-and-resolver-pings.pcap.out b/test/results/stats/default/dnscrypt-v1-and-resolver-pings.pcap.out
index 9c7177de3..f73ebfe13 100644
--- a/test/results/stats/default/dnscrypt-v1-and-resolver-pings.pcap.out
+++ b/test/results/stats/default/dnscrypt-v1-and-resolver-pings.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:1539
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:1581010
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:245
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:245
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:200
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:245
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:244416
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:44650
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:56
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:488
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:1539
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:1581010
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:245
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:245
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:200
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:245
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:244416
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:44650
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:56
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:488
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:56
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:445
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:245
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:445
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:245
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:245
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:245
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:245
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:56
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:56
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:245
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:245
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/dnscrypt-v2-doh.pcap.out b/test/results/stats/default/dnscrypt-v2-doh.pcap.out
index 281ece720..940500cf5 100644
--- a/test/results/stats/default/dnscrypt-v2-doh.pcap.out
+++ b/test/results/stats/default/dnscrypt-v2-doh.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:309
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:413256
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:34
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:34
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:34
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:36
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:32683
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:152737
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:168
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:309
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:413256
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:34
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:34
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:34
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:36
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:32683
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:152737
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:168
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:70
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:34
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:70
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:34
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:34
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:34
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,35 +108,20 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:34
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:34
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
diff --git a/test/results/stats/default/dnscrypt-v2.pcap.out b/test/results/stats/default/dnscrypt-v2.pcap.out
index e378fcc66..28bfe0eed 100644
--- a/test/results/stats/default/dnscrypt-v2.pcap.out
+++ b/test/results/stats/default/dnscrypt-v2.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:18
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:18618
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:3264
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:784
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:18
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:18618
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:3264
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:784
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/dnscrypt_skype_false_positive.pcapng.out b/test/results/stats/default/dnscrypt_skype_false_positive.pcapng.out
index 24b4fbdc3..3a2cf88dc 100644
--- a/test/results/stats/default/dnscrypt_skype_false_positive.pcapng.out
+++ b/test/results/stats/default/dnscrypt_skype_false_positive.pcapng.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:11688
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1536
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:592
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:11688
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1536
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:592
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/doh.pcapng.out b/test/results/stats/default/doh.pcapng.out
index ead54fbcf..64295cd95 100644
--- a/test/results/stats/default/doh.pcapng.out
+++ b/test/results/stats/default/doh.pcapng.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:12136
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1881
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:5821
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:12136
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1881
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:5821
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -110,8 +135,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
@@ -138,5 +163,5 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_51_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_52_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_53_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_52_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_53_count" interval=60 N:2
diff --git a/test/results/stats/default/doq.pcapng.out b/test/results/stats/default/doq.pcapng.out
index 0901da7b3..a48dd04c6 100644
--- a/test/results/stats/default/doq.pcapng.out
+++ b/test/results/stats/default/doq.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:19
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:18369
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:2350
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:2416
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:19
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:18369
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:2350
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:2416
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -110,8 +135,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
diff --git a/test/results/stats/default/doq_adguard.pcapng.out b/test/results/stats/default/doq_adguard.pcapng.out
index 9d6bae82b..cac0107f7 100644
--- a/test/results/stats/default/doq_adguard.pcapng.out
+++ b/test/results/stats/default/doq_adguard.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:16689
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:10308
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:21705
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:16689
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:10308
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:21705
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/dos_win98_smb_netbeui.pcap.out b/test/results/stats/default/dos_win98_smb_netbeui.pcap.out
index cd9e236ed..afff24ac0 100644
--- a/test/results/stats/default/dos_win98_smb_netbeui.pcap.out
+++ b/test/results/stats/default/dos_win98_smb_netbeui.pcap.out
@@ -1,32 +1,50 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:110
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:60101
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:5953
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:35
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:16
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:110
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:60101
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:5953
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:35
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:35
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,17 +58,22 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:35
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:35
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -108,8 +133,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
diff --git a/test/results/stats/default/drda_db2.pcap.out b/test/results/stats/default/drda_db2.pcap.out
index bf926db38..1d1cfa513 100644
--- a/test/results/stats/default/drda_db2.pcap.out
+++ b/test/results/stats/default/drda_db2.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:9747
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:2081
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:2542
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:9747
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:2081
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:2542
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/dropbox.pcap.out b/test/results/stats/default/dropbox.pcap.out
index 80eaa9971..4bf452310 100644
--- a/test/results/stats/default/dropbox.pcap.out
+++ b/test/results/stats/default/dropbox.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:132
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:114241
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:43692
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:11224
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:63
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:132
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:114241
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:43692
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:11224
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:63
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:30
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:15
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -39,8 +57,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:15
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:15
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/dtls.pcap.out b/test/results/stats/default/dtls.pcap.out
index 41f0a2548..07540f816 100644
--- a/test/results/stats/default/dtls.pcap.out
+++ b/test/results/stats/default/dtls.pcap.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:8134
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:310
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:8134
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:310
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -101,8 +126,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
@@ -110,8 +135,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/dtls2.pcap.out b/test/results/stats/default/dtls2.pcap.out
index a79f828ea..ec039ae99 100644
--- a/test/results/stats/default/dtls2.pcap.out
+++ b/test/results/stats/default/dtls2.pcap.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:17
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:17947
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1658
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:2073
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:17947
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1658
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:2073
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -94,15 +119,15 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
@@ -110,8 +135,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
diff --git a/test/results/stats/default/dtls_certificate.pcapng.out b/test/results/stats/default/dtls_certificate.pcapng.out
index db6f46b86..4fcc965ff 100644
--- a/test/results/stats/default/dtls_certificate.pcapng.out
+++ b/test/results/stats/default/dtls_certificate.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:7855
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1444
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:7855
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1444
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -95,8 +120,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
diff --git a/test/results/stats/default/dtls_certificate_fragments.pcap.out b/test/results/stats/default/dtls_certificate_fragments.pcap.out
index 058f519cc..ef92d43b9 100644
--- a/test/results/stats/default/dtls_certificate_fragments.pcap.out
+++ b/test/results/stats/default/dtls_certificate_fragments.pcap.out
@@ -1,37 +1,55 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:25
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:30786
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:3051
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:6050
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:25
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:30786
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:3051
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:6050
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -41,7 +59,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -94,15 +119,15 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
@@ -110,8 +135,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
@@ -127,13 +152,13 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_37_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_38_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/dtls_mid_sessions.pcapng.out b/test/results/stats/default/dtls_mid_sessions.pcapng.out
index 2da0bee72..d9dae4572 100644
--- a/test/results/stats/default/dtls_mid_sessions.pcapng.out
+++ b/test/results/stats/default/dtls_mid_sessions.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:31
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:32981
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:29417
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:4629
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:16
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:31
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:32981
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:29417
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:4629
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/dtls_old_version.pcapng.out b/test/results/stats/default/dtls_old_version.pcapng.out
index 9aac23a64..99ea57f98 100644
--- a/test/results/stats/default/dtls_old_version.pcapng.out
+++ b/test/results/stats/default/dtls_old_version.pcapng.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:11575
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:416
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:284
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:11575
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:416
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:284
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,34 +108,19 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/dtls_session_id_and_coockie_both.pcap.out b/test/results/stats/default/dtls_session_id_and_coockie_both.pcap.out
index bbfeb28a5..6f7db18ea 100644
--- a/test/results/stats/default/dtls_session_id_and_coockie_both.pcap.out
+++ b/test/results/stats/default/dtls_session_id_and_coockie_both.pcap.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:9496
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:218
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:218
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:9496
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:218
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:218
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -101,8 +126,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
@@ -110,8 +135,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
diff --git a/test/results/stats/default/edonkey.pcap.out b/test/results/stats/default/edonkey.pcap.out
index ce6f7e8a2..e61b21880 100644
--- a/test/results/stats/default/edonkey.pcap.out
+++ b/test/results/stats/default/edonkey.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:7875
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:248
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:792
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:7875
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:248
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:792
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,13 +44,14 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -108,8 +133,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
diff --git a/test/results/stats/default/elasticsearch.pcap.out b/test/results/stats/default/elasticsearch.pcap.out
index dc3138673..86b41584a 100644
--- a/test/results/stats/default/elasticsearch.pcap.out
+++ b/test/results/stats/default/elasticsearch.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:44
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:38544
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:8322
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1267
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:19
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:44
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:38544
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:8322
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1267
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:19
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/emotet.pcap.out b/test/results/stats/default/emotet.pcap.out
index c1c65e54e..96e279b14 100644
--- a/test/results/stats/default/emotet.pcap.out
+++ b/test/results/stats/default/emotet.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:63
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:60034
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:406814
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1588411
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:30
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:63
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:60034
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:406814
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1588411
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:30
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,41 +108,26 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
@@ -110,8 +135,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
diff --git a/test/results/stats/default/encrypted_sni.pcap.out b/test/results/stats/default/encrypted_sni.pcap.out
index cb4e82ee0..31cf6a37a 100644
--- a/test/results/stats/default/encrypted_sni.pcap.out
+++ b/test/results/stats/default/encrypted_sni.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:15224
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:2148
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:15224
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:2148
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/epicgames.pcapng.out b/test/results/stats/default/epicgames.pcapng.out
index e1f76d8e8..d24b9fd1b 100644
--- a/test/results/stats/default/epicgames.pcapng.out
+++ b/test/results/stats/default/epicgames.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:35
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:24741
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:5959
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1825
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:20
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:35
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:24741
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:5959
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1825
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:4
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/esp.pcapng.out b/test/results/stats/default/esp.pcapng.out
index 818875fe9..53e9ede49 100644
--- a/test/results/stats/default/esp.pcapng.out
+++ b/test/results/stats/default/esp.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:12327
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:834
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:786
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:12327
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:834
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:786
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/ethereum.pcap.out b/test/results/stats/default/ethereum.pcap.out
index 5cd6182a4..7bb8ddfd5 100644
--- a/test/results/stats/default/ethereum.pcap.out
+++ b/test/results/stats/default/ethereum.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:573
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:509228
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:74
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:47
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:27
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:33
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:71
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:43570
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:43398
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:315
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:573
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:509228
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:74
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:47
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:27
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:33
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:71
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:43570
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:43398
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:315
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:71
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:71
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:71
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:74
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:18
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:74
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:71
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/ethernetIP.pcap.out b/test/results/stats/default/ethernetIP.pcap.out
index 04c02c8cb..e8210861a 100644
--- a/test/results/stats/default/ethernetIP.pcap.out
+++ b/test/results/stats/default/ethernetIP.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:35
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:28698
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:6348
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:5528
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:20
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:35
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:28698
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:6348
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:5528
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/exe_download.pcap.out b/test/results/stats/default/exe_download.pcap.out
index c83ee7ebc..a65a5b607 100644
--- a/test/results/stats/default/exe_download.pcap.out
+++ b/test/results/stats/default/exe_download.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:12624
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:153
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:679332
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:12624
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:153
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:679332
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,38 +108,23 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
@@ -133,8 +158,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_51_count" interval=60 N:0
diff --git a/test/results/stats/default/exe_download_as_png.pcap.out b/test/results/stats/default/exe_download_as_png.pcap.out
index e12d2fdb0..b6552112d 100644
--- a/test/results/stats/default/exe_download_as_png.pcap.out
+++ b/test/results/stats/default/exe_download_as_png.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:12231
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:299
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:500298
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:12231
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:299
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:500298
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,38 +108,23 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
@@ -133,8 +158,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_51_count" interval=60 N:0
diff --git a/test/results/stats/default/facebook.pcap.out b/test/results/stats/default/facebook.pcap.out
index 29eefe033..631f7c4ef 100644
--- a/test/results/stats/default/facebook.pcap.out
+++ b/test/results/stats/default/facebook.pcap.out
@@ -1,38 +1,56 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:23
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:20634
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:2145
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:24374
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:23
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:20634
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:2145
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:24374
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/fastcgi.pcap.out b/test/results/stats/default/fastcgi.pcap.out
index c8c022008..3b6642828 100644
--- a/test/results/stats/default/fastcgi.pcap.out
+++ b/test/results/stats/default/fastcgi.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:10889
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1095
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:64400
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:10889
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1095
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:64400
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/firefox.pcap.out b/test/results/stats/default/firefox.pcap.out
index 6ea899caa..3aaadd773 100644
--- a/test/results/stats/default/firefox.pcap.out
+++ b/test/results/stats/default/firefox.pcap.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:57
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:48625
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:7370
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:44229
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:30
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:57
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:48625
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:7370
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:44229
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:30
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/fix.pcap.out b/test/results/stats/default/fix.pcap.out
index 89daf965a..0d266f5aa 100644
--- a/test/results/stats/default/fix.pcap.out
+++ b/test/results/stats/default/fix.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:104
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:80495
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:34736
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:2850
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:60
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:104
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:80495
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:34736
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:2850
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:60
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:12
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:12
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/fix2.pcap.out b/test/results/stats/default/fix2.pcap.out
index f5ad02a57..a81f2d832 100644
--- a/test/results/stats/default/fix2.pcap.out
+++ b/test/results/stats/default/fix2.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:21
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:17076
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:24259
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:43697
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:17076
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:24259
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:43697
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/forticlient.pcap.out b/test/results/stats/default/forticlient.pcap.out
index ec67f5e53..a43391600 100644
--- a/test/results/stats/default/forticlient.pcap.out
+++ b/test/results/stats/default/forticlient.pcap.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:54
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:52847
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:73125
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:225634
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:25
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:54
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:52847
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:73125
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:225634
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:25
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,41 +108,26 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:15
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:15
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
diff --git a/test/results/stats/default/ftp-start-tls.pcap.out b/test/results/stats/default/ftp-start-tls.pcap.out
index 484f0714f..01de8a469 100644
--- a/test/results/stats/default/ftp-start-tls.pcap.out
+++ b/test/results/stats/default/ftp-start-tls.pcap.out
@@ -1,39 +1,57 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:14689
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:856
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:3834
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:14689
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:856
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:3834
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -94,24 +119,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
diff --git a/test/results/stats/default/ftp.pcap.out b/test/results/stats/default/ftp.pcap.out
index 53e09911b..1b35c4674 100644
--- a/test/results/stats/default/ftp.pcap.out
+++ b/test/results/stats/default/ftp.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:29
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:26734
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:174
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1050670
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:29
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:26734
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:174
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1050670
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,13 +44,14 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -108,8 +133,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
@@ -122,8 +147,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_32_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_33_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_34_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_35_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_36_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_37_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_36_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_37_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_38_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
diff --git a/test/results/stats/default/ftp_failed.pcap.out b/test/results/stats/default/ftp_failed.pcap.out
index e066bac6e..36d687245 100644
--- a/test/results/stats/default/ftp_failed.pcap.out
+++ b/test/results/stats/default/ftp_failed.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:8109
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:24
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:112
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:8109
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:24
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:112
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,13 +44,14 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -108,8 +133,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
@@ -122,8 +147,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_32_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_33_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_34_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_35_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_36_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_37_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_36_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_37_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_38_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
diff --git a/test/results/stats/default/fuzz-2006-06-26-2594.pcap.out b/test/results/stats/default/fuzz-2006-06-26-2594.pcap.out
index 79be06713..d7ec9a126 100644
--- a/test/results/stats/default/fuzz-2006-06-26-2594.pcap.out
+++ b/test/results/stats/default/fuzz-2006-06-26-2594.pcap.out
@@ -1,33 +1,51 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:2134
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:1900498
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:257
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:255
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:666
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:27
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:191
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:105
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:39
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:44852
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:16036
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:86
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:79
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:427
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:2134
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:1900498
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:257
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:255
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:666
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:27
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:191
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:105
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:39
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:44774
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:16036
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:86
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:79
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:427
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:35
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:37
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:820
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:186
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
@@ -36,21 +54,26 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interv
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:69
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:13
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:667
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:157
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:95
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:20
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:191
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:120
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:51
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:257
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:224
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:10
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:79
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:35
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:37
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:257
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:191
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:27
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:39
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -103,13 +128,13 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:163
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:55
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
@@ -125,15 +150,15 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_35_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_36_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_37_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_38_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:155
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:64
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:210
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:82
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/fuzz-2006-09-29-28586.pcap.out b/test/results/stats/default/fuzz-2006-09-29-28586.pcap.out
index 5cf5fe454..8a96cfb51 100644
--- a/test/results/stats/default/fuzz-2006-09-29-28586.pcap.out
+++ b/test/results/stats/default/fuzz-2006-09-29-28586.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:219
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:190551
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:39
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:27
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:23
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:14756
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:10874
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:82
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:219
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:190551
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:39
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:27
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:23
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:14756
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:10874
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:82
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:12
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:12
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:39
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:39
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:23
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -97,9 +122,9 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/fuzz-2020-02-16-11740.pcap.out b/test/results/stats/default/fuzz-2020-02-16-11740.pcap.out
index 1809139aa..2ed2a0f9c 100644
--- a/test/results/stats/default/fuzz-2020-02-16-11740.pcap.out
+++ b/test/results/stats/default/fuzz-2020-02-16-11740.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:615
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:548022
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:79
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:79
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:133
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:57
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:19
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:113402
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:20335
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:65
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:107
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:615
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:548022
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:79
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:79
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:133
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:57
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:19
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:109463
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:20335
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:65
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:107
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:27
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:27
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:152
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:57
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:152
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:57
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:57
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:79
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:72
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:65
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:27
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:27
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:79
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:57
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:19
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/fuzz-2021-06-07-c6c72a0a56.pcap.out b/test/results/stats/default/fuzz-2021-06-07-c6c72a0a56.pcap.out
index 1e2300542..23f3c6489 100644
--- a/test/results/stats/default/fuzz-2021-06-07-c6c72a0a56.pcap.out
+++ b/test/results/stats/default/fuzz-2021-06-07-c6c72a0a56.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:3405
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:3405
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/fuzz-2021-10-13.pcap.out b/test/results/stats/default/fuzz-2021-10-13.pcap.out
index 6d2fe4f59..add24dd56 100644
--- a/test/results/stats/default/fuzz-2021-10-13.pcap.out
+++ b/test/results/stats/default/fuzz-2021-10-13.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:2768
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:2768
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/geforcenow.pcapng.out b/test/results/stats/default/geforcenow.pcapng.out
index 1f6b44d7f..89b6e98b6 100644
--- a/test/results/stats/default/geforcenow.pcapng.out
+++ b/test/results/stats/default/geforcenow.pcapng.out
@@ -1,32 +1,50 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:27
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:33178
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:9542
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:53610
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:27
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:33178
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:9542
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:53610
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -34,13 +52,13 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interva
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -101,8 +126,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
@@ -110,15 +135,15 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_29_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_30_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_31_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_32_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_32_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_33_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_34_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_35_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/genshin-impact.pcap.out b/test/results/stats/default/genshin-impact.pcap.out
index bff162750..8d1a12a7f 100644
--- a/test/results/stats/default/genshin-impact.pcap.out
+++ b/test/results/stats/default/genshin-impact.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:56
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:39812
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:8247
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:5700
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:30
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:56
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:39812
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:8247
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:5700
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:30
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:6
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
diff --git a/test/results/stats/default/git.pcap.out b/test/results/stats/default/git.pcap.out
index bb5f48046..ab1ea7918 100644
--- a/test/results/stats/default/git.pcap.out
+++ b/test/results/stats/default/git.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:9562
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:605
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:67444
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:9562
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:605
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:67444
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/gnutella.pcap.out b/test/results/stats/default/gnutella.pcap.out
index 1dd82cca8..bd38c604e 100644
--- a/test/results/stats/default/gnutella.pcap.out
+++ b/test/results/stats/default/gnutella.pcap.out
@@ -1,56 +1,79 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:6866
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:5752180
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:801
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:66
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:735
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:2519
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:401
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:399
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:149308
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:234286
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:359
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:1928
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:157
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:6866
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:5752180
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:801
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:66
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:735
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:2519
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:401
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:399
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:149308
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:234286
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:359
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:1928
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:42
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:1728
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:356
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:356
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:122
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:32
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:47
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:12
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:1726
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:401
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:362
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:787
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:14
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,57 +108,42 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:653
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:801
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:401
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:399
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:1740
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:360
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_29_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_30_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_31_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_32_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_32_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_33_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_34_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_35_count" interval=60 N:0
diff --git a/test/results/stats/default/google_ssl.pcap.out b/test/results/stats/default/google_ssl.pcap.out
index 51f82d7c5..dd8d7202d 100644
--- a/test/results/stats/default/google_ssl.pcap.out
+++ b/test/results/stats/default/google_ssl.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:7277
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:644
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:6924
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:7277
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:644
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:6924
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/googledns_android10.pcap.out b/test/results/stats/default/googledns_android10.pcap.out
index 4300c370a..525068324 100644
--- a/test/results/stats/default/googledns_android10.pcap.out
+++ b/test/results/stats/default/googledns_android10.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:77
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:70113
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:21058
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:76784
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:36
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:77
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:70113
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:21058
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:76784
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:36
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -101,8 +126,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:14
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
diff --git a/test/results/stats/default/gquic.pcap.out b/test/results/stats/default/gquic.pcap.out
index 71bff6fe0..07bd65ec9 100644
--- a/test/results/stats/default/gquic.pcap.out
+++ b/test/results/stats/default/gquic.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:7045
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1350
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:7045
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1350
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/gtp_c.pcap.out b/test/results/stats/default/gtp_c.pcap.out
index aa2e57e23..7ae4a5805 100644
--- a/test/results/stats/default/gtp_c.pcap.out
+++ b/test/results/stats/default/gtp_c.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:7315
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:281
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:235
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:7315
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:281
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:235
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/gtp_false_positive.pcapng.out b/test/results/stats/default/gtp_false_positive.pcapng.out
index b2be3dd70..b63f5ac50 100644
--- a/test/results/stats/default/gtp_false_positive.pcapng.out
+++ b/test/results/stats/default/gtp_false_positive.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:22
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:16445
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:778
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:22
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:16445
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:552
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/gtp_prime.pcapng.out b/test/results/stats/default/gtp_prime.pcapng.out
index 935d08168..f5b3fa5d3 100644
--- a/test/results/stats/default/gtp_prime.pcapng.out
+++ b/test/results/stats/default/gtp_prime.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:2877
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:2877
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/h323-overflow.pcap.out b/test/results/stats/default/h323-overflow.pcap.out
index b57bcde2a..c4300d23b 100644
--- a/test/results/stats/default/h323-overflow.pcap.out
+++ b/test/results/stats/default/h323-overflow.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:5055
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:5055
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/h323.pcap.out b/test/results/stats/default/h323.pcap.out
index 1ba23575f..e21a280c4 100644
--- a/test/results/stats/default/h323.pcap.out
+++ b/test/results/stats/default/h323.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:16
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:12121
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:692
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:605
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:12121
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:692
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:605
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/haproxy.pcap.out b/test/results/stats/default/haproxy.pcap.out
index 4f05414fd..58aec991d 100644
--- a/test/results/stats/default/haproxy.pcap.out
+++ b/test/results/stats/default/haproxy.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:5478
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:309
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:5478
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:309
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/heuristic_tcp_ack_payload.pcap.out b/test/results/stats/default/heuristic_tcp_ack_payload.pcap.out
index 26b410553..66f9db1bf 100644
--- a/test/results/stats/default/heuristic_tcp_ack_payload.pcap.out
+++ b/test/results/stats/default/heuristic_tcp_ack_payload.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:57
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:45396
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:21646
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:123872
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:30
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:57
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:45396
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:14860
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:81741
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:30
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/hots.pcapng.out b/test/results/stats/default/hots.pcapng.out
index 26c435258..3d07cea52 100644
--- a/test/results/stats/default/hots.pcapng.out
+++ b/test/results/stats/default/hots.pcapng.out
@@ -1,32 +1,50 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:32
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:25603
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:5321
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:624
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:32
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:25603
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:5321
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:624
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -34,7 +52,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interva
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/hpvirtgrp.pcap.out b/test/results/stats/default/hpvirtgrp.pcap.out
index 6a9554bd7..c895ebcb7 100644
--- a/test/results/stats/default/hpvirtgrp.pcap.out
+++ b/test/results/stats/default/hpvirtgrp.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:82
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:57212
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:3797
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1308
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:45
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:82
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:57212
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:3797
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1308
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:45
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:9
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:9
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/hsrp0.pcap.out b/test/results/stats/default/hsrp0.pcap.out
index e9c30bf08..733eb9ad4 100644
--- a/test/results/stats/default/hsrp0.pcap.out
+++ b/test/results/stats/default/hsrp0.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:19
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:14753
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:80
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:19
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:14753
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:80
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/hsrp2.pcap.out b/test/results/stats/default/hsrp2.pcap.out
index e7dbf1207..fc7be38f6 100644
--- a/test/results/stats/default/hsrp2.pcap.out
+++ b/test/results/stats/default/hsrp2.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:8391
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:104
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:8391
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:104
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/hsrp2_ipv6.pcapng.out b/test/results/stats/default/hsrp2_ipv6.pcapng.out
index 2da0be6b3..4d5aec9a2 100644
--- a/test/results/stats/default/hsrp2_ipv6.pcapng.out
+++ b/test/results/stats/default/hsrp2_ipv6.pcapng.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:23
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:18278
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1998
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:23
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:18278
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1998
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
diff --git a/test/results/stats/default/http-crash-content-disposition.pcap.out b/test/results/stats/default/http-crash-content-disposition.pcap.out
index 21bcf473a..a68a22292 100644
--- a/test/results/stats/default/http-crash-content-disposition.pcap.out
+++ b/test/results/stats/default/http-crash-content-disposition.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:8325
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:475
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:2369
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:8325
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:475
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:2369
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/http-lines-split.pcap.out b/test/results/stats/default/http-lines-split.pcap.out
index 517825e15..9542aa607 100644
--- a/test/results/stats/default/http-lines-split.pcap.out
+++ b/test/results/stats/default/http-lines-split.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:9067
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:67
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1632
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:9067
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:67
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1632
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,37 +108,22 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
diff --git a/test/results/stats/default/http-manipulated.pcap.out b/test/results/stats/default/http-manipulated.pcap.out
index bc0bcfc1e..0951e5d93 100644
--- a/test/results/stats/default/http-manipulated.pcap.out
+++ b/test/results/stats/default/http-manipulated.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:20
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:14916
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:797
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:42034
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:14916
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:797
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:42034
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
diff --git a/test/results/stats/default/http-proxy.pcapng.out b/test/results/stats/default/http-proxy.pcapng.out
index ff1e8011a..b5e9024a8 100644
--- a/test/results/stats/default/http-proxy.pcapng.out
+++ b/test/results/stats/default/http-proxy.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:7930
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:294
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:716
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:7930
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:294
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:716
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/http2.pcapng.out b/test/results/stats/default/http2.pcapng.out
index 3d62eaaeb..81adefffe 100644
--- a/test/results/stats/default/http2.pcapng.out
+++ b/test/results/stats/default/http2.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:7814
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:319
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:272
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:7814
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:319
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:272
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/http_asymmetric.pcapng.out b/test/results/stats/default/http_asymmetric.pcapng.out
index aa3c5a36a..ca8c5e4e8 100644
--- a/test/results/stats/default/http_asymmetric.pcapng.out
+++ b/test/results/stats/default/http_asymmetric.pcapng.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:20
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:20857
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:8665
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:20857
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:8665
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -97,8 +122,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
@@ -129,11 +154,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/http_auth.pcap.out b/test/results/stats/default/http_auth.pcap.out
index c77abf261..e8b3b7e69 100644
--- a/test/results/stats/default/http_auth.pcap.out
+++ b/test/results/stats/default/http_auth.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:12877
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:739
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:17637
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:12877
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:739
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:17637
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -122,15 +147,15 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_32_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_33_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_34_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_35_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_36_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_37_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_36_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_37_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_38_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
diff --git a/test/results/stats/default/http_connect.pcap.out b/test/results/stats/default/http_connect.pcap.out
index 714ceb620..d1118f71c 100644
--- a/test/results/stats/default/http_connect.pcap.out
+++ b/test/results/stats/default/http_connect.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:28
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:24874
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:3644
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:53729
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:28
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:24874
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:3644
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:53729
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/http_guessed_host_and_guessed.pcapng.out b/test/results/stats/default/http_guessed_host_and_guessed.pcapng.out
index 6ff5c4dc1..ffe3f2a7a 100644
--- a/test/results/stats/default/http_guessed_host_and_guessed.pcapng.out
+++ b/test/results/stats/default/http_guessed_host_and_guessed.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:5534
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:49
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:5534
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:49
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/http_invalid_server.pcap.out b/test/results/stats/default/http_invalid_server.pcap.out
index 239dd2b49..d9b6a3936 100644
--- a/test/results/stats/default/http_invalid_server.pcap.out
+++ b/test/results/stats/default/http_invalid_server.pcap.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:9410
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:82
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:407
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:9410
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:82
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:407
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -97,11 +122,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
diff --git a/test/results/stats/default/http_ipv6.pcap.out b/test/results/stats/default/http_ipv6.pcap.out
index ac7f13167..7ac5b474e 100644
--- a/test/results/stats/default/http_ipv6.pcap.out
+++ b/test/results/stats/default/http_ipv6.pcap.out
@@ -1,38 +1,56 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:117
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:105125
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:10659
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:40534
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:55
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:117
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:105125
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:10659
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:40534
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:55
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:15
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -96,8 +121,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/http_on_sip_port.pcap.out b/test/results/stats/default/http_on_sip_port.pcap.out
index 40bd59483..998489de8 100644
--- a/test/results/stats/default/http_on_sip_port.pcap.out
+++ b/test/results/stats/default/http_on_sip_port.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:11316
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:223
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1360
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:11316
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:223
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1360
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,38 +108,23 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
@@ -129,8 +154,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
diff --git a/test/results/stats/default/http_origin_different_than_host.pcap.out b/test/results/stats/default/http_origin_different_than_host.pcap.out
index 2deaec80a..5da4d298e 100644
--- a/test/results/stats/default/http_origin_different_than_host.pcap.out
+++ b/test/results/stats/default/http_origin_different_than_host.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:6189
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:6189
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/http_starting_with_reply.pcapng.out b/test/results/stats/default/http_starting_with_reply.pcapng.out
index 28d68149b..553677c11 100644
--- a/test/results/stats/default/http_starting_with_reply.pcapng.out
+++ b/test/results/stats/default/http_starting_with_reply.pcapng.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:16343
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:7613
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:688
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:16343
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:7613
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:688
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -97,8 +122,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/http_ua_splitted_in_two_pkts.pcapng.out b/test/results/stats/default/http_ua_splitted_in_two_pkts.pcapng.out
index 049cbaebc..69e8a61a6 100644
--- a/test/results/stats/default/http_ua_splitted_in_two_pkts.pcapng.out
+++ b/test/results/stats/default/http_ua_splitted_in_two_pkts.pcapng.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:13337
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:62424
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:6280
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:13337
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:62424
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:6280
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/i3d.pcap.out b/test/results/stats/default/i3d.pcap.out
index 5934afaed..179c5a555 100644
--- a/test/results/stats/default/i3d.pcap.out
+++ b/test/results/stats/default/i3d.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:37
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:33181
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:33668
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:304
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:20
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:37
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:33181
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:33668
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:304
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:4
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/iax.pcap.out b/test/results/stats/default/iax.pcap.out
index cd2adf6f2..8e8e78397 100644
--- a/test/results/stats/default/iax.pcap.out
+++ b/test/results/stats/default/iax.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:9444
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:4046
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:3008
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:9444
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:4046
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:3008
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/icmp-tunnel.pcap.out b/test/results/stats/default/icmp-tunnel.pcap.out
index 182c0627c..536d39304 100644
--- a/test/results/stats/default/icmp-tunnel.pcap.out
+++ b/test/results/stats/default/icmp-tunnel.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:39
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:39274
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:26
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:83334
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:78134
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:39
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:39274
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:26
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:83334
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:78134
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:27
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:27
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -103,8 +128,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:27
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
diff --git a/test/results/stats/default/iec60780-5-104.pcap.out b/test/results/stats/default/iec60780-5-104.pcap.out
index 007ffe09c..f4ec24e67 100644
--- a/test/results/stats/default/iec60780-5-104.pcap.out
+++ b/test/results/stats/default/iec60780-5-104.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:53
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:37838
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:413
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:335
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:30
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:53
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:37838
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:413
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:335
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:30
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/imap-starttls.pcap.out b/test/results/stats/default/imap-starttls.pcap.out
index 5835c7add..494cfd420 100644
--- a/test/results/stats/default/imap-starttls.pcap.out
+++ b/test/results/stats/default/imap-starttls.pcap.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:14694
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:540
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:5653
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:14694
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:540
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:5653
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,9 +44,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -101,8 +126,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
@@ -110,8 +135,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
diff --git a/test/results/stats/default/imap.pcap.out b/test/results/stats/default/imap.pcap.out
index c9fe84f25..463dd7619 100644
--- a/test/results/stats/default/imap.pcap.out
+++ b/test/results/stats/default/imap.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:10229
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:179
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1401
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:10229
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:179
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1401
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:1
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -108,8 +133,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
@@ -122,8 +147,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_32_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_33_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_34_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_35_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_36_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_37_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_36_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_37_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_38_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
diff --git a/test/results/stats/default/imaps.pcap.out b/test/results/stats/default/imaps.pcap.out
index be7d70503..bb337ec7a 100644
--- a/test/results/stats/default/imaps.pcap.out
+++ b/test/results/stats/default/imaps.pcap.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:23
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:18227
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1582
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:6084
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:23
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:18227
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1582
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:6084
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,9 +44,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -101,8 +126,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
diff --git a/test/results/stats/default/imo.pcap.out b/test/results/stats/default/imo.pcap.out
index 16021d695..8ac238176 100644
--- a/test/results/stats/default/imo.pcap.out
+++ b/test/results/stats/default/imo.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:21
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:19509
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:18943
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:12237
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:19509
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:18943
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:12237
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/instagram.pcap.out b/test/results/stats/default/instagram.pcap.out
index c13294f60..f772b7d64 100644
--- a/test/results/stats/default/instagram.pcap.out
+++ b/test/results/stats/default/instagram.pcap.out
@@ -1,46 +1,64 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:299
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:318080
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:38
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:32
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:30
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:18
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:210270
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:440492
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:150
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:299
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:318080
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:38
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:32
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:30
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:18
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:116573
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:413697
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:150
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:40
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:22
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:33
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:18
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:30
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:38
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,33 +108,18 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:38
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:30
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:14
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
diff --git a/test/results/stats/default/ip_fragmented_garbage.pcap.out b/test/results/stats/default/ip_fragmented_garbage.pcap.out
index d310fc496..ac38ab7be 100644
--- a/test/results/stats/default/ip_fragmented_garbage.pcap.out
+++ b/test/results/stats/default/ip_fragmented_garbage.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:151
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:101187
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:29
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:19
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:29
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:80
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:16
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:29
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:151
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:101187
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:29
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:19
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:29
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:80
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:29
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:29
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:16
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:16
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:29
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:29
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/iphone.pcap.out b/test/results/stats/default/iphone.pcap.out
index b818fd474..3be31a222 100644
--- a/test/results/stats/default/iphone.pcap.out
+++ b/test/results/stats/default/iphone.pcap.out
@@ -1,37 +1,55 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:356
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:322035
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:51
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:48
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:50
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:40
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:99351
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:91009
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:156
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:35
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:38
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:356
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:322035
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:51
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:48
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:50
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:40
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:99351
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:91009
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:156
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:24
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:9
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:31
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:12
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -40,10 +58,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:50
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:31
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:1
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:50
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:46
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:31
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:51
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:50
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/ipp.pcap.out b/test/results/stats/default/ipp.pcap.out
index 67ab0efc4..3022389af 100644
--- a/test/results/stats/default/ipp.pcap.out
+++ b/test/results/stats/default/ipp.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:28
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:24121
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:228781
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1443
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:28
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:24121
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:228781
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1443
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,38 +108,23 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
diff --git a/test/results/stats/default/ipsec_isakmp_esp.pcap.out b/test/results/stats/default/ipsec_isakmp_esp.pcap.out
index c492b4cfa..986f593bb 100644
--- a/test/results/stats/default/ipsec_isakmp_esp.pcap.out
+++ b/test/results/stats/default/ipsec_isakmp_esp.pcap.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:321
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:314839
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:36
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:36
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:20
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:36
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:341776
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:193546
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:174
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:56
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:321
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:314839
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:36
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:36
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:36
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:341776
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:193546
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:174
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:36
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,8 +44,9 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:56
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:36
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:36
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:36
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:36
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:36
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:36
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -103,8 +128,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
diff --git a/test/results/stats/default/ipv6_in_gtp.pcap.out b/test/results/stats/default/ipv6_in_gtp.pcap.out
index d0cb9fe77..e515f5755 100644
--- a/test/results/stats/default/ipv6_in_gtp.pcap.out
+++ b/test/results/stats/default/ipv6_in_gtp.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:4160
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:4160
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/irc.pcap.out b/test/results/stats/default/irc.pcap.out
index 4a60bb710..eb7341b48 100644
--- a/test/results/stats/default/irc.pcap.out
+++ b/test/results/stats/default/irc.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:8023
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:114
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:6901
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:8023
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:114
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:6901
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -108,8 +133,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
@@ -122,8 +147,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_32_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_33_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_34_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_35_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_36_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_37_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_36_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_37_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_38_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
diff --git a/test/results/stats/default/ja3_lots_of_cipher_suites.pcap.out b/test/results/stats/default/ja3_lots_of_cipher_suites.pcap.out
index 18a216620..231d5fda0 100644
--- a/test/results/stats/default/ja3_lots_of_cipher_suites.pcap.out
+++ b/test/results/stats/default/ja3_lots_of_cipher_suites.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:25
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:15868
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:25
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:15868
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/ja3_lots_of_cipher_suites_2_anon.pcap.out b/test/results/stats/default/ja3_lots_of_cipher_suites_2_anon.pcap.out
index a4333ba43..02eacfefc 100644
--- a/test/results/stats/default/ja3_lots_of_cipher_suites_2_anon.pcap.out
+++ b/test/results/stats/default/ja3_lots_of_cipher_suites_2_anon.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:37
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:22382
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:2974
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:2858
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:37
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:22382
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:2974
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:2858
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/jabber.pcap.out b/test/results/stats/default/jabber.pcap.out
index 430232144..aec8ad47f 100644
--- a/test/results/stats/default/jabber.pcap.out
+++ b/test/results/stats/default/jabber.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:110
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:81346
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:11121
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:27335
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:60
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:110
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:81346
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:11121
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:27335
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:60
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:12
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:12
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/kerberos-error.pcap.out b/test/results/stats/default/kerberos-error.pcap.out
index 2783f31c9..1e5c6858d 100644
--- a/test/results/stats/default/kerberos-error.pcap.out
+++ b/test/results/stats/default/kerberos-error.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:6279
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:287
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:102
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:6279
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:287
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:102
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/kerberos-login.pcap.out b/test/results/stats/default/kerberos-login.pcap.out
index 840f96fd4..c11351af4 100644
--- a/test/results/stats/default/kerberos-login.pcap.out
+++ b/test/results/stats/default/kerberos-login.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:80
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:101251
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:17733
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:17509
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:29
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:80
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:101251
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:17733
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:17509
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:29
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:13
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:13
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:13
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:12
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/kerberos.pcap.out b/test/results/stats/default/kerberos.pcap.out
index c208b3dec..668c4f73f 100644
--- a/test/results/stats/default/kerberos.pcap.out
+++ b/test/results/stats/default/kerberos.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:190
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:172994
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:36
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:36
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:23
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:13668
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:10465
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:76
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:190
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:172994
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:36
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:36
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:23
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:13668
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:10465
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:76
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:11
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:11
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:36
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:36
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:23
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/kerberos_fuzz.pcapng.out b/test/results/stats/default/kerberos_fuzz.pcapng.out
index e478792c2..09390ee21 100644
--- a/test/results/stats/default/kerberos_fuzz.pcapng.out
+++ b/test/results/stats/default/kerberos_fuzz.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:5586
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:260
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:5586
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:260
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/kismet.pcap.out b/test/results/stats/default/kismet.pcap.out
index 0771372bb..be61306e4 100644
--- a/test/results/stats/default/kismet.pcap.out
+++ b/test/results/stats/default/kismet.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:9761
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1045
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1912
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:9761
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1045
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1912
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/kontiki.pcap.out b/test/results/stats/default/kontiki.pcap.out
index 8a385084f..7954e0a45 100644
--- a/test/results/stats/default/kontiki.pcap.out
+++ b/test/results/stats/default/kontiki.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:48
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:38394
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:2261
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:33151
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:20
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:48
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:38394
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:2261
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:33151
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -108,8 +133,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
diff --git a/test/results/stats/default/line.pcap.out b/test/results/stats/default/line.pcap.out
index e3c869f65..65a998a3c 100644
--- a/test/results/stats/default/line.pcap.out
+++ b/test/results/stats/default/line.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:51
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:52006
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:25568
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:23936
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:25
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:51
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:52006
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:25568
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:23936
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:25
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -35,8 +53,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -101,8 +126,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
diff --git a/test/results/stats/default/linecall_falsepositve.pcap.out b/test/results/stats/default/linecall_falsepositve.pcap.out
index 1056b7e2c..aa3747b0d 100644
--- a/test/results/stats/default/linecall_falsepositve.pcap.out
+++ b/test/results/stats/default/linecall_falsepositve.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:67
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:39112
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:32
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:67
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:39112
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:32
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:32
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:32
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:32
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/lisp_registration.pcap.out b/test/results/stats/default/lisp_registration.pcap.out
index ea1ceed18..e33e667d5 100644
--- a/test/results/stats/default/lisp_registration.pcap.out
+++ b/test/results/stats/default/lisp_registration.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:35
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:26536
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1976
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1814
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:20
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:35
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:26536
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1976
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1814
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/log4j-webapp-exploit.pcap.out b/test/results/stats/default/log4j-webapp-exploit.pcap.out
index 3fcfcb607..4d5de852d 100644
--- a/test/results/stats/default/log4j-webapp-exploit.pcap.out
+++ b/test/results/stats/default/log4j-webapp-exploit.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:67
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:51154
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:2128
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:3702
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:32
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:67
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:51154
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:2128
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:3702
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:32
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,40 +108,25 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
@@ -126,8 +151,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_36_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_37_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_38_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
diff --git a/test/results/stats/default/long_tls_certificate.pcap.out b/test/results/stats/default/long_tls_certificate.pcap.out
index ec06dc3b4..5e9ba00b6 100644
--- a/test/results/stats/default/long_tls_certificate.pcap.out
+++ b/test/results/stats/default/long_tls_certificate.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:17195
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1073
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:11027
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:17195
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1073
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:11027
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/lru_ipv6_caches.pcapng.out b/test/results/stats/default/lru_ipv6_caches.pcapng.out
index adda7292c..93da90a87 100644
--- a/test/results/stats/default/lru_ipv6_caches.pcapng.out
+++ b/test/results/stats/default/lru_ipv6_caches.pcapng.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:85
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:86431
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:14408
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:846
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:41
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:85
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:86431
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:14408
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:846
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:41
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:11
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,13 +44,14 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:3
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:12
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:9
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:10
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/malformed_dns.pcap.out b/test/results/stats/default/malformed_dns.pcap.out
index d2786931a..09f4bc91d 100644
--- a/test/results/stats/default/malformed_dns.pcap.out
+++ b/test/results/stats/default/malformed_dns.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:15777
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:56
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:5552
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:15777
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:56
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:5552
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -103,8 +128,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
@@ -123,8 +148,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_33_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_34_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_35_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_36_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_37_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_38_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_37_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_38_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:0
@@ -135,8 +160,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_51_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_52_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_53_count" interval=60 N:0
diff --git a/test/results/stats/default/malformed_icmp.pcap.out b/test/results/stats/default/malformed_icmp.pcap.out
index e0de6d983..9de866340 100644
--- a/test/results/stats/default/malformed_icmp.pcap.out
+++ b/test/results/stats/default/malformed_icmp.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:5251
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:5251
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -103,8 +128,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
diff --git a/test/results/stats/default/malware.pcap.out b/test/results/stats/default/malware.pcap.out
index a63695daa..ddabd4069 100644
--- a/test/results/stats/default/malware.pcap.out
+++ b/test/results/stats/default/malware.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:44
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:39583
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:5602
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:521068
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:16
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:44
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:39583
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:5602
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:521068
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -96,8 +121,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
diff --git a/test/results/stats/default/memcached.cap.out b/test/results/stats/default/memcached.cap.out
index 250e82b32..dc9c0bba6 100644
--- a/test/results/stats/default/memcached.cap.out
+++ b/test/results/stats/default/memcached.cap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:7351
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1028
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:7351
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1028
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/merakicloud.pcapng.out b/test/results/stats/default/merakicloud.pcapng.out
index 6e08dd714..998f0e83f 100644
--- a/test/results/stats/default/merakicloud.pcapng.out
+++ b/test/results/stats/default/merakicloud.pcapng.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:19
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:17132
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:2679
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1522
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:19
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:17132
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:2679
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1522
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/mgcp.pcap.out b/test/results/stats/default/mgcp.pcap.out
index a9477f156..0e382a8ad 100644
--- a/test/results/stats/default/mgcp.pcap.out
+++ b/test/results/stats/default/mgcp.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:36
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:26343
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1364
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:393
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:36
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:26343
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1364
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:393
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -36,7 +54,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interv
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/modbus.pcap.out b/test/results/stats/default/modbus.pcap.out
index 52d2792cd..4b7741da8 100644
--- a/test/results/stats/default/modbus.pcap.out
+++ b/test/results/stats/default/modbus.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:9515
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:612
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:561
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:9515
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:612
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:561
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/monero.pcap.out b/test/results/stats/default/monero.pcap.out
index 063be8019..44641a751 100644
--- a/test/results/stats/default/monero.pcap.out
+++ b/test/results/stats/default/monero.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:22
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:18888
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:135768
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:10322
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:22
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:18888
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:135768
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:10322
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -108,8 +133,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
diff --git a/test/results/stats/default/mongo_false_positive.pcapng.out b/test/results/stats/default/mongo_false_positive.pcapng.out
index c72c261f8..c3bda15e5 100644
--- a/test/results/stats/default/mongo_false_positive.pcapng.out
+++ b/test/results/stats/default/mongo_false_positive.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:10461
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:9246
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1485
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:10461
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:9246
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1485
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/mongodb.pcap.out b/test/results/stats/default/mongodb.pcap.out
index e98de0331..6c405b361 100644
--- a/test/results/stats/default/mongodb.pcap.out
+++ b/test/results/stats/default/mongodb.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:45
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:31678
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:706
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:23
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:45
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:31678
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:706
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:23
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
diff --git a/test/results/stats/default/mpeg-dash.pcap.out b/test/results/stats/default/mpeg-dash.pcap.out
index c2afda819..18cb589c3 100644
--- a/test/results/stats/default/mpeg-dash.pcap.out
+++ b/test/results/stats/default/mpeg-dash.pcap.out
@@ -1,33 +1,51 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:30
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:27830
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:2220
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1591
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:30
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:27830
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:2220
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1591
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -97,8 +122,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
diff --git a/test/results/stats/default/mpeg.pcap.out b/test/results/stats/default/mpeg.pcap.out
index 39473f82b..cfd23d553 100644
--- a/test/results/stats/default/mpeg.pcap.out
+++ b/test/results/stats/default/mpeg.pcap.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:8751
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:148
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:9215
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:8751
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:148
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:9215
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,7 +44,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/mpegts.pcap.out b/test/results/stats/default/mpegts.pcap.out
index 9a85b35ea..72569cce4 100644
--- a/test/results/stats/default/mpegts.pcap.out
+++ b/test/results/stats/default/mpegts.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:7345
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1316
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:7345
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1316
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:1
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/mqtt.pcap.out b/test/results/stats/default/mqtt.pcap.out
index 754d423a8..097e12db6 100644
--- a/test/results/stats/default/mqtt.pcap.out
+++ b/test/results/stats/default/mqtt.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:11044
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:383
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:492
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:11044
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:383
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:492
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/mssql_tds.pcap.out b/test/results/stats/default/mssql_tds.pcap.out
index a0435890c..2c336393a 100644
--- a/test/results/stats/default/mssql_tds.pcap.out
+++ b/test/results/stats/default/mssql_tds.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:65
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:64530
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:20929
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1552
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:24
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:65
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:64530
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:12590
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1552
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:24
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:11
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:12
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/mullvad_dns.pcap.out b/test/results/stats/default/mullvad_dns.pcap.out
index 2f65f4e73..e6504f240 100644
--- a/test/results/stats/default/mullvad_dns.pcap.out
+++ b/test/results/stats/default/mullvad_dns.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:7020
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:56
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:74
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:7020
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:56
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:74
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/mullvad_wireguard.pcap.out b/test/results/stats/default/mullvad_wireguard.pcap.out
index 8e5f1e911..151fcab19 100644
--- a/test/results/stats/default/mullvad_wireguard.pcap.out
+++ b/test/results/stats/default/mullvad_wireguard.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:8242
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:576
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:928
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:8242
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:576
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:928
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
diff --git a/test/results/stats/default/munin.pcap.out b/test/results/stats/default/munin.pcap.out
index f21b62e68..4d07fe788 100644
--- a/test/results/stats/default/munin.pcap.out
+++ b/test/results/stats/default/munin.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:38
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:25837
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:242
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1156
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:20
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:38
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:25837
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:242
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1156
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/mysql-8.pcap.out b/test/results/stats/default/mysql-8.pcap.out
index 0eda65a56..c906dcf3b 100644
--- a/test/results/stats/default/mysql-8.pcap.out
+++ b/test/results/stats/default/mysql-8.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:19
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:13132
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:808
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:3074
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:19
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:13132
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:808
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:3074
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/natpmp.pcap.out b/test/results/stats/default/natpmp.pcap.out
index c53806bae..a14d16134 100644
--- a/test/results/stats/default/natpmp.pcap.out
+++ b/test/results/stats/default/natpmp.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:31
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:24151
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:88
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:28
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:31
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:24151
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:88
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:28
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/nats.pcap.out b/test/results/stats/default/nats.pcap.out
index 58596108c..d396ede3a 100644
--- a/test/results/stats/default/nats.pcap.out
+++ b/test/results/stats/default/nats.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:19
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:13444
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:276
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:636
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:19
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:13444
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:276
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:636
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/ndpi_match_string_subprotocol__error.pcapng.out b/test/results/stats/default/ndpi_match_string_subprotocol__error.pcapng.out
index 525028044..0116931e3 100644
--- a/test/results/stats/default/ndpi_match_string_subprotocol__error.pcapng.out
+++ b/test/results/stats/default/ndpi_match_string_subprotocol__error.pcapng.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:12517
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1648
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1053
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:12517
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1648
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1053
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -42,7 +60,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interva
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,38 +108,23 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/nest_log_sink.pcap.out b/test/results/stats/default/nest_log_sink.pcap.out
index b81657491..15cfa07df 100644
--- a/test/results/stats/default/nest_log_sink.pcap.out
+++ b/test/results/stats/default/nest_log_sink.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:168
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:146433
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:17
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:16
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:55213
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:20167
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:80
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:168
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:146433
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:55213
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:20167
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:80
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:29
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:16
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:17
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/netbios.pcap.out b/test/results/stats/default/netbios.pcap.out
index 855078061..faf01f183 100644
--- a/test/results/stats/default/netbios.pcap.out
+++ b/test/results/stats/default/netbios.pcap.out
@@ -1,32 +1,50 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:83
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:68939
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:13027
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:700
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:30
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:83
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:68939
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:13027
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:700
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:30
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:12
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -44,13 +62,18 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:14
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:15
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:14
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -108,8 +133,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
diff --git a/test/results/stats/default/netbios_wildcard_dns_query.pcap.out b/test/results/stats/default/netbios_wildcard_dns_query.pcap.out
index adafcb206..97fc69760 100644
--- a/test/results/stats/default/netbios_wildcard_dns_query.pcap.out
+++ b/test/results/stats/default/netbios_wildcard_dns_query.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:5387
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:50
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:5387
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:50
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/netflix.pcap.out b/test/results/stats/default/netflix.pcap.out
index 411d840e5..611837293 100644
--- a/test/results/stats/default/netflix.pcap.out
+++ b/test/results/stats/default/netflix.pcap.out
@@ -1,32 +1,50 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:557
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:553210
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:61
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:31
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:30
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:27
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:60
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:69
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:117204
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:768140
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:33
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:266
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:557
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:553210
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:61
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:31
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:30
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:27
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:60
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:69
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:117204
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:768140
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:33
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:266
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:44
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:94
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:22
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:38
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,17 +58,22 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:35
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:13
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:65
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:28
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:18
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:60
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:70
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:18
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:61
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,41 +108,26 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:13
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:61
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:60
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:18
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:18
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:36
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:36
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:32
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:32
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
@@ -111,8 +136,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_29_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/netflow-fritz.pcap.out b/test/results/stats/default/netflow-fritz.pcap.out
index ac391509a..ae45a993a 100644
--- a/test/results/stats/default/netflow-fritz.pcap.out
+++ b/test/results/stats/default/netflow-fritz.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:5362
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:180
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:5362
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:180
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/netflowv9.pcap.out b/test/results/stats/default/netflowv9.pcap.out
index 5627e853f..0e22315c9 100644
--- a/test/results/stats/default/netflowv9.pcap.out
+++ b/test/results/stats/default/netflowv9.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:16548
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:13468
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:16548
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:13468
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
diff --git a/test/results/stats/default/nfsv2.pcap.out b/test/results/stats/default/nfsv2.pcap.out
index f48a186bd..051604a14 100644
--- a/test/results/stats/default/nfsv2.pcap.out
+++ b/test/results/stats/default/nfsv2.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:42
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:34510
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:10080
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:6512
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:17
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:42
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:34510
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:10080
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:6512
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
diff --git a/test/results/stats/default/nfsv3.pcap.out b/test/results/stats/default/nfsv3.pcap.out
index f9c91c61a..db7b70758 100644
--- a/test/results/stats/default/nfsv3.pcap.out
+++ b/test/results/stats/default/nfsv3.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:47
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:38781
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:8508
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:8932
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:19
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:47
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:38781
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:8508
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:8932
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:19
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
diff --git a/test/results/stats/default/nintendo.pcap.out b/test/results/stats/default/nintendo.pcap.out
index 2805e4520..3969a7379 100644
--- a/test/results/stats/default/nintendo.pcap.out
+++ b/test/results/stats/default/nintendo.pcap.out
@@ -1,32 +1,50 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:164
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:135106
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:21
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:19
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:151475
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:137750
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:84
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:164
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:135106
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:19
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:151475
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:137750
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:84
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:12
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -34,13 +52,13 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interva
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:9
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:21
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:15
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -101,8 +126,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
diff --git a/test/results/stats/default/nntp.pcap.out b/test/results/stats/default/nntp.pcap.out
index 289b4855d..98cfe9e13 100644
--- a/test/results/stats/default/nntp.pcap.out
+++ b/test/results/stats/default/nntp.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:9673
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:113
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:4808
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:9673
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:113
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:4808
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/no_sni.pcap.out b/test/results/stats/default/no_sni.pcap.out
index aae72cfc6..dec85ec4e 100644
--- a/test/results/stats/default/no_sni.pcap.out
+++ b/test/results/stats/default/no_sni.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:79
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:70589
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:14690
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:42821
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:40
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:79
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:70589
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:14690
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:42821
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:40
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/ocs.pcap.out b/test/results/stats/default/ocs.pcap.out
index 48e915000..8f1c6647e 100644
--- a/test/results/stats/default/ocs.pcap.out
+++ b/test/results/stats/default/ocs.pcap.out
@@ -1,32 +1,50 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:137
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:113267
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:20
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:18
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:12361
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:65
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:137
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:113267
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:18
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:12361
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:65
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:18
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:20
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,41 +108,26 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:18
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:10
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/ocsp.pcapng.out b/test/results/stats/default/ocsp.pcapng.out
index d6389917a..c2ea57bf6 100644
--- a/test/results/stats/default/ocsp.pcapng.out
+++ b/test/results/stats/default/ocsp.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:93
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:84562
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:6995
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:26118
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:50
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:93
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:84562
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:6995
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:26118
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:50
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:9
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:10
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/oicq.pcap.out b/test/results/stats/default/oicq.pcap.out
index 3d50c9314..3d3099681 100644
--- a/test/results/stats/default/oicq.pcap.out
+++ b/test/results/stats/default/oicq.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:146
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:118285
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:29
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:29
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:29
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1324
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:29
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:146
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:118285
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:29
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:29
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:29
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1324
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:29
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:43
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:29
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -35,7 +53,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:43
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:29
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:29
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:29
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:29
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:29
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:29
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/ookla.pcap.out b/test/results/stats/default/ookla.pcap.out
index 79bb496bd..0e9b3a8ad 100644
--- a/test/results/stats/default/ookla.pcap.out
+++ b/test/results/stats/default/ookla.pcap.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:56
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:43291
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:22919
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:9629
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:30
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:56
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:43291
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:22732
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:8117
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:30
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -133,8 +158,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_51_count" interval=60 N:0
diff --git a/test/results/stats/default/openvpn.pcap.out b/test/results/stats/default/openvpn.pcap.out
index fb36ce49b..f2e4b4888 100644
--- a/test/results/stats/default/openvpn.pcap.out
+++ b/test/results/stats/default/openvpn.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:32
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:28570
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:19308
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:22991
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:32
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:28570
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:19308
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:22991
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
diff --git a/test/results/stats/default/opera-vpn.pcapng.out b/test/results/stats/default/opera-vpn.pcapng.out
index 6e71793f7..c543ad5f0 100644
--- a/test/results/stats/default/opera-vpn.pcapng.out
+++ b/test/results/stats/default/opera-vpn.pcapng.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:618
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:612038
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:62
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:28
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:34
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:60
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:61
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:61
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:206752
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:980038
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:308
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:618
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:612038
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:62
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:28
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:34
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:60
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:61
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:61
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:206752
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:980038
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:308
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:122
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:61
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,8 +44,9 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:122
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:61
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:61
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:62
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:62
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:61
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -101,8 +126,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
diff --git a/test/results/stats/default/oracle12.pcapng.out b/test/results/stats/default/oracle12.pcapng.out
index ccc3d0b7b..9e10767cb 100644
--- a/test/results/stats/default/oracle12.pcapng.out
+++ b/test/results/stats/default/oracle12.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:7421
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:941
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:441
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:7421
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:941
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:441
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/os_detected.pcapng.out b/test/results/stats/default/os_detected.pcapng.out
index aec1bc6b9..17ad6d2a1 100644
--- a/test/results/stats/default/os_detected.pcapng.out
+++ b/test/results/stats/default/os_detected.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:7652
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1252
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:7652
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1252
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -110,8 +135,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
@@ -138,5 +163,5 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_51_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_52_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_53_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_52_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_53_count" interval=60 N:1
diff --git a/test/results/stats/default/ospfv2_add_new_prefix.pcap.out b/test/results/stats/default/ospfv2_add_new_prefix.pcap.out
index d787ae29e..f6d9628b3 100644
--- a/test/results/stats/default/ospfv2_add_new_prefix.pcap.out
+++ b/test/results/stats/default/ospfv2_add_new_prefix.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:5734
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:88
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:44
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:5734
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:88
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:44
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/ossfuzz_seed_fake_traces_1.pcapng.out b/test/results/stats/default/ossfuzz_seed_fake_traces_1.pcapng.out
index fb45710c0..92ce53588 100644
--- a/test/results/stats/default/ossfuzz_seed_fake_traces_1.pcapng.out
+++ b/test/results/stats/default/ossfuzz_seed_fake_traces_1.pcapng.out
@@ -1,46 +1,64 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:59
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:49186
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:2613
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:28
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:18
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:59
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:49186
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:2613
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:28
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:18
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:1
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:10
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -108,8 +133,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
@@ -132,11 +157,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_51_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_51_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_52_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_53_count" interval=60 N:0
diff --git a/test/results/stats/default/ossfuzz_seed_fake_traces_2.pcapng.out b/test/results/stats/default/ossfuzz_seed_fake_traces_2.pcapng.out
index e24e30a1d..845ca3e54 100644
--- a/test/results/stats/default/ossfuzz_seed_fake_traces_2.pcapng.out
+++ b/test/results/stats/default/ossfuzz_seed_fake_traces_2.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:39
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:28634
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:479
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:441
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:19
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:39
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:28634
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:331
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:377
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:19
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/ossfuzz_seed_fake_traces_3.pcapng.out b/test/results/stats/default/ossfuzz_seed_fake_traces_3.pcapng.out
index 0ba1baa6c..f1de73e56 100644
--- a/test/results/stats/default/ossfuzz_seed_fake_traces_3.pcapng.out
+++ b/test/results/stats/default/ossfuzz_seed_fake_traces_3.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:7088
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:82
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:7088
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:82
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:1
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/ossfuzz_seed_fake_traces_4.pcapng.out b/test/results/stats/default/ossfuzz_seed_fake_traces_4.pcapng.out
index 4ee5e9d79..112946594 100644
--- a/test/results/stats/default/ossfuzz_seed_fake_traces_4.pcapng.out
+++ b/test/results/stats/default/ossfuzz_seed_fake_traces_4.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:5444
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:5444
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/pgm.pcap.out b/test/results/stats/default/pgm.pcap.out
index 17f55cafb..5f32a09bf 100644
--- a/test/results/stats/default/pgm.pcap.out
+++ b/test/results/stats/default/pgm.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:11553
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:162302
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:11553
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:162302
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/pgsql.pcap.out b/test/results/stats/default/pgsql.pcap.out
index 7cf67bd99..0500df74c 100644
--- a/test/results/stats/default/pgsql.pcap.out
+++ b/test/results/stats/default/pgsql.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:52
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:35497
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1157
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1836
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:30
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:52
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:35497
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1157
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1836
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:30
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/pim.pcap.out b/test/results/stats/default/pim.pcap.out
index 049bba3b3..929c3bbf7 100644
--- a/test/results/stats/default/pim.pcap.out
+++ b/test/results/stats/default/pim.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:7314
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:580
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:7314
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:580
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/pinterest.pcap.out b/test/results/stats/default/pinterest.pcap.out
index b93b38756..9f565d14a 100644
--- a/test/results/stats/default/pinterest.pcap.out
+++ b/test/results/stats/default/pinterest.pcap.out
@@ -1,38 +1,56 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:297
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:295069
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:37
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:32
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:16
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:21
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:33
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:30054
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:337815
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:137
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:31
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:297
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:295069
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:37
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:32
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:33
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:30054
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:337815
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:137
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:11
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:17
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:31
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:11
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
@@ -51,15 +69,37 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_banned_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:37
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:37
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/pluralsight.pcap.out b/test/results/stats/default/pluralsight.pcap.out
index a72b96ffa..db5abaa14 100644
--- a/test/results/stats/default/pluralsight.pcap.out
+++ b/test/results/stats/default/pluralsight.pcap.out
@@ -1,32 +1,50 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:59
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:72624
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:3540
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:23176
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:28
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:59
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:72624
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:3540
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:23176
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:28
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -43,7 +61,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/pop3.pcap.out b/test/results/stats/default/pop3.pcap.out
index b8d661a16..dc9d7da86 100644
--- a/test/results/stats/default/pop3.pcap.out
+++ b/test/results/stats/default/pop3.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:53
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:39534
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:417
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:22283
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:30
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:53
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:39534
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:417
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:22283
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:30
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:6
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -108,8 +133,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
@@ -122,8 +147,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_32_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_33_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_34_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_35_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_36_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_37_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_36_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_37_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_38_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
diff --git a/test/results/stats/default/pop3_stls.pcap.out b/test/results/stats/default/pop3_stls.pcap.out
index a37f67be7..03b422d22 100644
--- a/test/results/stats/default/pop3_stls.pcap.out
+++ b/test/results/stats/default/pop3_stls.pcap.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:13665
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:805
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:7462
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:13665
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:805
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:7462
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:1
@@ -27,9 +44,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,33 +108,18 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
@@ -108,8 +133,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
diff --git a/test/results/stats/default/pops.pcapng.out b/test/results/stats/default/pops.pcapng.out
index 96cca62c4..ee1d35d8f 100644
--- a/test/results/stats/default/pops.pcapng.out
+++ b/test/results/stats/default/pops.pcapng.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:12201
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:184
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:2520
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:12201
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:184
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:2520
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,9 +44,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -101,8 +126,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
diff --git a/test/results/stats/default/pps.pcap.out b/test/results/stats/default/pps.pcap.out
index 344da7f95..71785817b 100644
--- a/test/results/stats/default/pps.pcap.out
+++ b/test/results/stats/default/pps.pcap.out
@@ -1,39 +1,57 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:701
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:729380
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:107
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:105
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:35
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:76
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:49
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:29
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:248444
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:241859
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:47
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:288
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:90
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:37
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:701
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:729380
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:107
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:105
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:35
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:76
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:49
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:29
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:248444
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:241859
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:47
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:288
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:55
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:20
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:34
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:25
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
@@ -43,14 +61,19 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:73
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:39
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:10
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:76
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:33
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:107
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,38 +108,23 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:44
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:107
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:76
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:29
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:10
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
@@ -129,12 +154,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:35
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:35
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_51_count" interval=60 N:0
diff --git a/test/results/stats/default/pptp.pcap.out b/test/results/stats/default/pptp.pcap.out
index 00eeb43c3..1b9295f30 100644
--- a/test/results/stats/default/pptp.pcap.out
+++ b/test/results/stats/default/pptp.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:7510
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:356
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:384
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:7510
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:356
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:384
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/protobuf.pcap.out b/test/results/stats/default/protobuf.pcap.out
index 484b942a6..92868e55e 100644
--- a/test/results/stats/default/protobuf.pcap.out
+++ b/test/results/stats/default/protobuf.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:47
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:32569
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1086
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:25
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:47
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:32569
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1086
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:25
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/protonvpn.pcap.out b/test/results/stats/default/protonvpn.pcap.out
index ffe0c2d98..b6444b54f 100644
--- a/test/results/stats/default/protonvpn.pcap.out
+++ b/test/results/stats/default/protonvpn.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:25
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:19741
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1624
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:6451
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:25
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:19741
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1624
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:6451
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,8 +44,9 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,35 +108,20 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
diff --git a/test/results/stats/default/psiphon3.pcap.out b/test/results/stats/default/psiphon3.pcap.out
index 4991b2521..1fccd66e9 100644
--- a/test/results/stats/default/psiphon3.pcap.out
+++ b/test/results/stats/default/psiphon3.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:13496
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:3700
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:5574
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:13496
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:3700
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:5574
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -110,8 +135,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
@@ -138,5 +163,5 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_51_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_52_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_53_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_52_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_53_count" interval=60 N:3
diff --git a/test/results/stats/default/punycode-idn.pcap.out b/test/results/stats/default/punycode-idn.pcap.out
index f4c82af8a..fe6869a7e 100644
--- a/test/results/stats/default/punycode-idn.pcap.out
+++ b/test/results/stats/default/punycode-idn.pcap.out
@@ -1,37 +1,55 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:24
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:20071
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:232
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:836
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:24
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:20071
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:232
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:836
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -128,9 +153,9 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_38_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
diff --git a/test/results/stats/default/quic-23.pcap.out b/test/results/stats/default/quic-23.pcap.out
index fb68f4855..5b4d2e86e 100644
--- a/test/results/stats/default/quic-23.pcap.out
+++ b/test/results/stats/default/quic-23.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:13120
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1993
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:3958
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:13120
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1993
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:3958
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/quic-24.pcap.out b/test/results/stats/default/quic-24.pcap.out
index e35ecf6ba..dd6003a58 100644
--- a/test/results/stats/default/quic-24.pcap.out
+++ b/test/results/stats/default/quic-24.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:12828
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:4378
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:2992
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:12828
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:4378
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:2992
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/quic-27.pcap.out b/test/results/stats/default/quic-27.pcap.out
index a7c2b3654..c26349a7f 100644
--- a/test/results/stats/default/quic-27.pcap.out
+++ b/test/results/stats/default/quic-27.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:16794
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:5523
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:6124
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:16794
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:5523
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:6124
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/quic-28.pcap.out b/test/results/stats/default/quic-28.pcap.out
index 51b60e8d0..e1f1b70fb 100644
--- a/test/results/stats/default/quic-28.pcap.out
+++ b/test/results/stats/default/quic-28.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:13222
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:5428
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:230739
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:13222
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:5428
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:230739
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/quic-29.pcap.out b/test/results/stats/default/quic-29.pcap.out
index 82f93ea65..6680e5caa 100644
--- a/test/results/stats/default/quic-29.pcap.out
+++ b/test/results/stats/default/quic-29.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:12821
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:4303
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:4453
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:12821
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:4303
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:4453
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/quic-33.pcapng.out b/test/results/stats/default/quic-33.pcapng.out
index 2b0a7303e..1470bf873 100644
--- a/test/results/stats/default/quic-33.pcapng.out
+++ b/test/results/stats/default/quic-33.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:14699
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1432
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:3470
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:14699
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1432
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:3470
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -110,8 +135,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
@@ -138,5 +163,5 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_51_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_52_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_53_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_52_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_53_count" interval=60 N:1
diff --git a/test/results/stats/default/quic-34.pcap.out b/test/results/stats/default/quic-34.pcap.out
index 21a706b87..839d110e4 100644
--- a/test/results/stats/default/quic-34.pcap.out
+++ b/test/results/stats/default/quic-34.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:14077
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1252
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:3416
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:14077
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1252
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:3416
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -110,8 +135,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
@@ -138,5 +163,5 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_51_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_52_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_53_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_52_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_53_count" interval=60 N:1
diff --git a/test/results/stats/default/quic-forcing-vn-with-data.pcapng.out b/test/results/stats/default/quic-forcing-vn-with-data.pcapng.out
index 887dca6a6..2bb5436cd 100644
--- a/test/results/stats/default/quic-forcing-vn-with-data.pcapng.out
+++ b/test/results/stats/default/quic-forcing-vn-with-data.pcapng.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:14593
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:5466
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:2691
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:14593
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:5466
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:2691
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -110,8 +135,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
@@ -138,5 +163,5 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_51_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_52_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_53_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_52_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_53_count" interval=60 N:1
diff --git a/test/results/stats/default/quic-fuzz-overflow.pcapng.out b/test/results/stats/default/quic-fuzz-overflow.pcapng.out
index 93fbd717e..cb5322493 100644
--- a/test/results/stats/default/quic-fuzz-overflow.pcapng.out
+++ b/test/results/stats/default/quic-fuzz-overflow.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:8263
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1252
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:8263
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1252
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -110,8 +135,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
diff --git a/test/results/stats/default/quic-mvfst-22.pcap.out b/test/results/stats/default/quic-mvfst-22.pcap.out
index d5abc2979..1ca420b4f 100644
--- a/test/results/stats/default/quic-mvfst-22.pcap.out
+++ b/test/results/stats/default/quic-mvfst-22.pcap.out
@@ -1,38 +1,56 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:15238
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:72648
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:195075
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:15238
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:72648
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:195075
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/quic-mvfst-22_decryption_error.pcap.out b/test/results/stats/default/quic-mvfst-22_decryption_error.pcap.out
index 0d54520aa..31645000b 100644
--- a/test/results/stats/default/quic-mvfst-22_decryption_error.pcap.out
+++ b/test/results/stats/default/quic-mvfst-22_decryption_error.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:10263
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:3572
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:38
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:10263
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:3572
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:38
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/quic-mvfst-27.pcapng.out b/test/results/stats/default/quic-mvfst-27.pcapng.out
index 923c5d969..d9d394b53 100644
--- a/test/results/stats/default/quic-mvfst-27.pcapng.out
+++ b/test/results/stats/default/quic-mvfst-27.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:15533
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:2538
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:6981
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:15533
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:2538
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:6981
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:1
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/quic-mvfst-exp.pcap.out b/test/results/stats/default/quic-mvfst-exp.pcap.out
index a44830df2..90b973682 100644
--- a/test/results/stats/default/quic-mvfst-exp.pcap.out
+++ b/test/results/stats/default/quic-mvfst-exp.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:15307
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:3496
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:20953
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:15307
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:3496
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:20953
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:1
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/quic-v2.pcapng.out b/test/results/stats/default/quic-v2.pcapng.out
index 7e550e97f..4c6a10c4d 100644
--- a/test/results/stats/default/quic-v2.pcapng.out
+++ b/test/results/stats/default/quic-v2.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:14490
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:2222
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:9532
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:14490
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:2222
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:9532
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
diff --git a/test/results/stats/default/quic.pcap.out b/test/results/stats/default/quic.pcap.out
index bd0a16507..61b29d311 100644
--- a/test/results/stats/default/quic.pcap.out
+++ b/test/results/stats/default/quic.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:80
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:115594
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:41643
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:285405
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:42
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:80
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:115594
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:41486
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:285324
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:42
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:5
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:1
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:10
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:10
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -110,8 +135,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
diff --git a/test/results/stats/default/quic046.pcap.out b/test/results/stats/default/quic046.pcap.out
index 64ed619d7..8697b46d3 100644
--- a/test/results/stats/default/quic046.pcap.out
+++ b/test/results/stats/default/quic046.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:12572
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:5170
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:81927
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:12572
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:5170
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:81927
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:1
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/quic_0RTT.pcap.out b/test/results/stats/default/quic_0RTT.pcap.out
index 46bcd2465..d2c426b1b 100644
--- a/test/results/stats/default/quic_0RTT.pcap.out
+++ b/test/results/stats/default/quic_0RTT.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:17
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:20045
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:3106
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:3906
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:20045
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:3106
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:3906
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/quic_cc_ack.pcapng.out b/test/results/stats/default/quic_cc_ack.pcapng.out
index 8074d07d7..8bd90be93 100644
--- a/test/results/stats/default/quic_cc_ack.pcapng.out
+++ b/test/results/stats/default/quic_cc_ack.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:12107
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:2700
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:12107
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:2700
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/quic_crypto_aes_auth_size.pcap.out b/test/results/stats/default/quic_crypto_aes_auth_size.pcap.out
index bd81a97eb..77bdd13e4 100644
--- a/test/results/stats/default/quic_crypto_aes_auth_size.pcap.out
+++ b/test/results/stats/default/quic_crypto_aes_auth_size.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:12747
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:2700
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:12747
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:2700
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:2
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/quic_frags_ch_in_multiple_packets.pcapng.out b/test/results/stats/default/quic_frags_ch_in_multiple_packets.pcapng.out
index 5fe921841..62ee68d43 100644
--- a/test/results/stats/default/quic_frags_ch_in_multiple_packets.pcapng.out
+++ b/test/results/stats/default/quic_frags_ch_in_multiple_packets.pcapng.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:14528
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:2464
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1286
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:14528
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:2464
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1286
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -110,8 +135,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
@@ -132,11 +157,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_51_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_52_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_53_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_52_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_53_count" interval=60 N:1
diff --git a/test/results/stats/default/quic_frags_ch_out_of_order_same_packet_craziness.pcapng.out b/test/results/stats/default/quic_frags_ch_out_of_order_same_packet_craziness.pcapng.out
index cfd021ade..c4a5b05e9 100644
--- a/test/results/stats/default/quic_frags_ch_out_of_order_same_packet_craziness.pcapng.out
+++ b/test/results/stats/default/quic_frags_ch_out_of_order_same_packet_craziness.pcapng.out
@@ -1,65 +1,105 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:667
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:936691
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:113
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:113
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:123
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:113
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:241650
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:179
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:24
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:177
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:52
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:667
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:936691
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:113
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:113
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:123
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:113
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:241650
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:179
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:24
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:88
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:22
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:49
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:21
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:115
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:61
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:36
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:15
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_banned_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:110
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:113
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:113
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:113
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:113
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/quic_interop_V.pcapng.out b/test/results/stats/default/quic_interop_V.pcapng.out
index 5be5bece3..5d3695bbe 100644
--- a/test/results/stats/default/quic_interop_V.pcapng.out
+++ b/test/results/stats/default/quic_interop_V.pcapng.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:471
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:631380
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:77
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:77
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:77
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:30
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:229418
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1702
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:58
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:207
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:471
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:631380
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:77
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:77
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:77
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:30
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:229418
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1702
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:58
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:207
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:107
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:77
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:93
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:63
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:77
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:30
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:68
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:42
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:35
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:63
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:9
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:77
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:77
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:62
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:62
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -121,8 +146,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_31_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_32_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_33_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_34_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_35_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_36_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_35_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_36_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_37_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_38_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:30
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:30
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/quic_q39.pcap.out b/test/results/stats/default/quic_q39.pcap.out
index 4be7054ac..a9674de58 100644
--- a/test/results/stats/default/quic_q39.pcap.out
+++ b/test/results/stats/default/quic_q39.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:14823
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:18965
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:2686
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:14823
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:18965
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:2686
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:1
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/quic_q43.pcap.out b/test/results/stats/default/quic_q43.pcap.out
index 7719fa08f..b7ce2bf56 100644
--- a/test/results/stats/default/quic_q43.pcap.out
+++ b/test/results/stats/default/quic_q43.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:7544
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1350
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:30
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:7544
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1350
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:30
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/quic_q46.pcap.out b/test/results/stats/default/quic_q46.pcap.out
index f12dce4ce..88dcfb0cb 100644
--- a/test/results/stats/default/quic_q46.pcap.out
+++ b/test/results/stats/default/quic_q46.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:14670
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1465
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:18936
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:14670
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1465
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:18936
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/quic_q46_b.pcap.out b/test/results/stats/default/quic_q46_b.pcap.out
index bbcebc26c..97abb5076 100644
--- a/test/results/stats/default/quic_q46_b.pcap.out
+++ b/test/results/stats/default/quic_q46_b.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:11478
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:2376
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:2844
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:11478
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:2376
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:2844
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:1
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/quic_q50.pcap.out b/test/results/stats/default/quic_q50.pcap.out
index 3b5bb7bfd..4158f9496 100644
--- a/test/results/stats/default/quic_q50.pcap.out
+++ b/test/results/stats/default/quic_q50.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:12958
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:3327
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:16267
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:12958
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:3327
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:16267
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/quic_t50.pcap.out b/test/results/stats/default/quic_t50.pcap.out
index ddc387b81..3d13a30d9 100644
--- a/test/results/stats/default/quic_t50.pcap.out
+++ b/test/results/stats/default/quic_t50.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:15329
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:2894
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:5022
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:15329
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:2894
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:5022
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/quic_t51.pcap.out b/test/results/stats/default/quic_t51.pcap.out
index 588746896..ad1745837 100644
--- a/test/results/stats/default/quic_t51.pcap.out
+++ b/test/results/stats/default/quic_t51.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:16680
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:2888
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:5904
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:16680
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:2888
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:5904
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/quickplay.pcap.out b/test/results/stats/default/quickplay.pcap.out
index 2e2c21ec9..1508ff619 100644
--- a/test/results/stats/default/quickplay.pcap.out
+++ b/test/results/stats/default/quickplay.pcap.out
@@ -1,32 +1,50 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:145
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:170570
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:21
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:19
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:21
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:37682
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:58185
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:68
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:145
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:170570
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:19
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:37682
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:58185
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:68
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:17
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -35,7 +53,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
@@ -43,7 +61,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:11
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:21
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:11
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/radius_false_positive.pcapng.out b/test/results/stats/default/radius_false_positive.pcapng.out
index 1510689dd..e4f0954e1 100644
--- a/test/results/stats/default/radius_false_positive.pcapng.out
+++ b/test/results/stats/default/radius_false_positive.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:11541
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:6859
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:11541
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:6859
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/raknet.pcap.out b/test/results/stats/default/raknet.pcap.out
index 1be0d36ac..5e45c0ac2 100644
--- a/test/results/stats/default/raknet.pcap.out
+++ b/test/results/stats/default/raknet.pcap.out
@@ -1,32 +1,50 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:95
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:80646
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:19
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:5863
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:753
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:36
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:95
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:80646
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:19
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:5863
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:753
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:36
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:30
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:12
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -34,7 +52,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interva
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:30
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:12
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:12
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:12
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/rdp.pcap.out b/test/results/stats/default/rdp.pcap.out
index 7ec83305b..ecacf4698 100644
--- a/test/results/stats/default/rdp.pcap.out
+++ b/test/results/stats/default/rdp.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:7475
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1081
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1661
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:7475
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1081
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1661
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -116,8 +141,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_29_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_30_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_31_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_30_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_31_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_32_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_33_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_34_count" interval=60 N:0
diff --git a/test/results/stats/default/rdp2.pcap.out b/test/results/stats/default/rdp2.pcap.out
index fe789a7af..d7cf48edd 100644
--- a/test/results/stats/default/rdp2.pcap.out
+++ b/test/results/stats/default/rdp2.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:29
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:29543
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:5097
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:4480
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:29
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:29543
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:5097
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:4480
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -116,8 +141,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_29_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_30_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_31_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_30_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_31_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_32_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_33_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_34_count" interval=60 N:0
diff --git a/test/results/stats/default/reasm_crash_anon.pcapng.out b/test/results/stats/default/reasm_crash_anon.pcapng.out
index adf486713..2478be02e 100644
--- a/test/results/stats/default/reasm_crash_anon.pcapng.out
+++ b/test/results/stats/default/reasm_crash_anon.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:10714
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:979
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:5441
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:10714
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:979
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:5441
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/reasm_segv_anon.pcapng.out b/test/results/stats/default/reasm_segv_anon.pcapng.out
index bcbfdefde..91167b4f3 100644
--- a/test/results/stats/default/reasm_segv_anon.pcapng.out
+++ b/test/results/stats/default/reasm_segv_anon.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:44
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:27010
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:2008
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:72488
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:16
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:44
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:27010
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:2008
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:72488
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:16
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:16
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/reddit.pcap.out b/test/results/stats/default/reddit.pcap.out
index 5aca0b8dd..14b719176 100644
--- a/test/results/stats/default/reddit.pcap.out
+++ b/test/results/stats/default/reddit.pcap.out
@@ -1,38 +1,56 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:582
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:557892
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:60
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:23
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:37
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:17
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:59
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:84
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:64920
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:481968
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:298
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:53
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:74
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:582
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:557892
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:60
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:23
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:37
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:59
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:84
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:64920
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:481968
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:298
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:26
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:26
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:49
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:68
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:23
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:23
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
@@ -51,15 +69,37 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:10
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_banned_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:59
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:60
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:59
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/riot.pcapng.out b/test/results/stats/default/riot.pcapng.out
index 1195a6e54..cd4bbe0ed 100644
--- a/test/results/stats/default/riot.pcapng.out
+++ b/test/results/stats/default/riot.pcapng.out
@@ -1,40 +1,58 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:18
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:25207
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:8202
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:18
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:25207
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:8202
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/riotgames.pcap.out b/test/results/stats/default/riotgames.pcap.out
index bb3f30f68..eabed0be8 100644
--- a/test/results/stats/default/riotgames.pcap.out
+++ b/test/results/stats/default/riotgames.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:62
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:45129
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1342
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:743
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:24
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:62
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:45129
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1342
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:743
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:24
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:9
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:9
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:9
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/rmcp.pcap.out b/test/results/stats/default/rmcp.pcap.out
index 268f0de2a..46cc1d0ab 100644
--- a/test/results/stats/default/rmcp.pcap.out
+++ b/test/results/stats/default/rmcp.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:29
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:22440
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:116
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:29
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:22440
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:116
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/roblox.pcapng.out b/test/results/stats/default/roblox.pcapng.out
index 1a7cb4c9f..a5d67f9d6 100644
--- a/test/results/stats/default/roblox.pcapng.out
+++ b/test/results/stats/default/roblox.pcapng.out
@@ -1,32 +1,50 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:39
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:43070
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:17844
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:11993
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:20
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:39
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:43070
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:17844
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:11993
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -34,7 +52,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interva
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/rsh-syslog-false-positive.pcap.out b/test/results/stats/default/rsh-syslog-false-positive.pcap.out
index 1b3a19cc3..ac54a1cd4 100644
--- a/test/results/stats/default/rsh-syslog-false-positive.pcap.out
+++ b/test/results/stats/default/rsh-syslog-false-positive.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:14741
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:4939
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:14741
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:4939
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/rsh.pcap.out b/test/results/stats/default/rsh.pcap.out
index b84635a39..931773be1 100644
--- a/test/results/stats/default/rsh.pcap.out
+++ b/test/results/stats/default/rsh.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:19
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:13829
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:66
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:39
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:19
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:13829
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:66
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:39
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -108,8 +133,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
@@ -122,8 +147,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_32_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_33_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_34_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_35_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_36_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_37_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_36_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_37_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_38_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
diff --git a/test/results/stats/default/rsync.pcap.out b/test/results/stats/default/rsync.pcap.out
index acfc93e73..c3912076a 100644
--- a/test/results/stats/default/rsync.pcap.out
+++ b/test/results/stats/default/rsync.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:7319
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:86
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:411
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:7319
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:86
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:411
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/rtcp_multiple_pkts_in_the_same_datagram.pcap.out b/test/results/stats/default/rtcp_multiple_pkts_in_the_same_datagram.pcap.out
index 93d7c437d..6f58c580f 100644
--- a/test/results/stats/default/rtcp_multiple_pkts_in_the_same_datagram.pcap.out
+++ b/test/results/stats/default/rtcp_multiple_pkts_in_the_same_datagram.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:8238
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:336
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:184
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:8238
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:336
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:184
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/rtmp.pcap.out b/test/results/stats/default/rtmp.pcap.out
index cc3b59c7c..d82f55567 100644
--- a/test/results/stats/default/rtmp.pcap.out
+++ b/test/results/stats/default/rtmp.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:9230
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:3452
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:3496
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:9230
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:3452
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:3496
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/rtp.pcapng.out b/test/results/stats/default/rtp.pcapng.out
index dc5e8a4d9..a590c449b 100644
--- a/test/results/stats/default/rtp.pcapng.out
+++ b/test/results/stats/default/rtp.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:28
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:27799
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:19602
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:13839
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:28
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:27799
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:19602
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:13839
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:1
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/rtsp.pcap.out b/test/results/stats/default/rtsp.pcap.out
index 5a117d0c8..f893c210d 100644
--- a/test/results/stats/default/rtsp.pcap.out
+++ b/test/results/stats/default/rtsp.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:65
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:55813
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:22024
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:45372
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:35
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:65
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:55813
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:22024
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:45372
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:35
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:7
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
diff --git a/test/results/stats/default/rtsp_setup_http.pcapng.out b/test/results/stats/default/rtsp_setup_http.pcapng.out
index 3158da9f5..7582491fe 100644
--- a/test/results/stats/default/rtsp_setup_http.pcapng.out
+++ b/test/results/stats/default/rtsp_setup_http.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:5643
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:179
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:5643
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:179
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:1
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
diff --git a/test/results/stats/default/rx.pcap.out b/test/results/stats/default/rx.pcap.out
index 45fbd6c26..8002a7018 100644
--- a/test/results/stats/default/rx.pcap.out
+++ b/test/results/stats/default/rx.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:40
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:33261
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:8248
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:12683
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:21
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:40
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:33261
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:8248
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:12683
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/s7comm.pcap.out b/test/results/stats/default/s7comm.pcap.out
index a1af41c8f..43acd7ffc 100644
--- a/test/results/stats/default/s7comm.pcap.out
+++ b/test/results/stats/default/s7comm.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:9509
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1202
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1088
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:9509
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1202
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1088
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/safari.pcap.out b/test/results/stats/default/safari.pcap.out
index 58800d12e..2124be7ba 100644
--- a/test/results/stats/default/safari.pcap.out
+++ b/test/results/stats/default/safari.pcap.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:69
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:59056
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:7006
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:65156
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:35
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:69
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:59056
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:7006
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:65156
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:35
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -101,8 +126,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:10
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
diff --git a/test/results/stats/default/salesforce.pcap.out b/test/results/stats/default/salesforce.pcap.out
index 0af7251ff..6f93f2c53 100644
--- a/test/results/stats/default/salesforce.pcap.out
+++ b/test/results/stats/default/salesforce.pcap.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:11151
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:610
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:3585
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:11151
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:610
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:3585
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -39,7 +57,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/sccp_hw_conf_register.pcapng.out b/test/results/stats/default/sccp_hw_conf_register.pcapng.out
index d1a967e58..333898942 100644
--- a/test/results/stats/default/sccp_hw_conf_register.pcapng.out
+++ b/test/results/stats/default/sccp_hw_conf_register.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:7618
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:496
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:100
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:7618
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:496
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:100
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/sctp.cap.out b/test/results/stats/default/sctp.cap.out
index 7306fdb2c..26030fe4f 100644
--- a/test/results/stats/default/sctp.cap.out
+++ b/test/results/stats/default/sctp.cap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:9269
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:140
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:64
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:9269
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:140
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:64
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/selfsigned.pcap.out b/test/results/stats/default/selfsigned.pcap.out
index 8f82a5888..a1857f374 100644
--- a/test/results/stats/default/selfsigned.pcap.out
+++ b/test/results/stats/default/selfsigned.pcap.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:10343
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:849
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1785
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:10343
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:849
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1785
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,35 +108,20 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
diff --git a/test/results/stats/default/sflow.pcap.out b/test/results/stats/default/sflow.pcap.out
index 223650a44..f52ff01c2 100644
--- a/test/results/stats/default/sflow.pcap.out
+++ b/test/results/stats/default/sflow.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:9113
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1324
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:9113
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1324
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/shadowsocks.pcap.out b/test/results/stats/default/shadowsocks.pcap.out
index 763a48c3c..066e909e1 100644
--- a/test/results/stats/default/shadowsocks.pcap.out
+++ b/test/results/stats/default/shadowsocks.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:19
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:12905
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:201
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:134662
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:19
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:12905
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:201
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:134662
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/signal.pcap.out b/test/results/stats/default/signal.pcap.out
index 8c56b3b92..95400b1b5 100644
--- a/test/results/stats/default/signal.pcap.out
+++ b/test/results/stats/default/signal.pcap.out
@@ -1,49 +1,67 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:175
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:159282
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:19
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:19
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:27
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:219449
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:54393
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:84
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:36
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:175
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:159282
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:19
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:19
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:27
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:219449
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:54393
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:84
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:13
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:30
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:10
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:19
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:19
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:19
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:19
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -101,8 +126,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/simple-dnscrypt.pcap.out b/test/results/stats/default/simple-dnscrypt.pcap.out
index c80434acd..47e611b79 100644
--- a/test/results/stats/default/simple-dnscrypt.pcap.out
+++ b/test/results/stats/default/simple-dnscrypt.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:45
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:41566
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:2480
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:36106
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:20
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:45
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:41566
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:2480
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:36106
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/sip.pcap.out b/test/results/stats/default/sip.pcap.out
index c14dca122..5cb84b4e1 100644
--- a/test/results/stats/default/sip.pcap.out
+++ b/test/results/stats/default/sip.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:59
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:57862
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:25
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:28304
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:16151
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:16
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:59
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:57862
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:25
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:28304
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:16151
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:29
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,7 +44,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
@@ -36,7 +54,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interv
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:27
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/sip_hello.pcapng.out b/test/results/stats/default/sip_hello.pcapng.out
index ca01f0f9a..38175354a 100644
--- a/test/results/stats/default/sip_hello.pcapng.out
+++ b/test/results/stats/default/sip_hello.pcapng.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:20
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:15568
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1962
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:2172
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:15568
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1962
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:2172
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -36,7 +54,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interv
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/sites.pcapng.out b/test/results/stats/default/sites.pcapng.out
index 166705863..5efbab503 100644
--- a/test/results/stats/default/sites.pcapng.out
+++ b/test/results/stats/default/sites.pcapng.out
@@ -1,56 +1,79 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:403
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:453218
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:47
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:40
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:43
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:49
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:31753
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:206418
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:196
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:18
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:27
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:46
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:403
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:453218
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:47
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:40
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:43
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:49
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:31753
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:206418
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:196
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:21
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:16
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:42
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:47
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:47
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:43
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -108,8 +133,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
diff --git a/test/results/stats/default/skinny.pcap.out b/test/results/stats/default/skinny.pcap.out
index d730bb9ce..4f09b8d12 100644
--- a/test/results/stats/default/skinny.pcap.out
+++ b/test/results/stats/default/skinny.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:76
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:69389
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:373748
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:124964
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:39
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:76
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:69389
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:373748
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:124964
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:39
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:9
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:9
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/skype-conference-call.pcap.out b/test/results/stats/default/skype-conference-call.pcap.out
index c52b273b9..493ee2108 100644
--- a/test/results/stats/default/skype-conference-call.pcap.out
+++ b/test/results/stats/default/skype-conference-call.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:10592
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:19259
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:12028
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:10592
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:19259
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:12028
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
diff --git a/test/results/stats/default/skype.pcap.out b/test/results/stats/default/skype.pcap.out
index a87a5aadb..e0367f299 100644
--- a/test/results/stats/default/skype.pcap.out
+++ b/test/results/stats/default/skype.pcap.out
@@ -1,56 +1,79 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:2154
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:1762881
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:293
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:92
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:201
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:385
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:28
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:206
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:35
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:59
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:185111
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:259084
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:36
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:844
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:609
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:2154
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:1762881
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:293
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:92
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:201
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:385
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:28
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:206
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:35
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:59
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:185111
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:259084
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:36
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:844
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:197
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:440
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:147
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:148
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:40
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:206
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:32
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:292
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,41 +108,26 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:191
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:293
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:206
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:28
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:59
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:87
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:28
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/skype_no_unknown.pcap.out b/test/results/stats/default/skype_no_unknown.pcap.out
index c57a72947..2919521cf 100644
--- a/test/results/stats/default/skype_no_unknown.pcap.out
+++ b/test/results/stats/default/skype_no_unknown.pcap.out
@@ -1,56 +1,79 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:1606
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:1289082
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:267
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:61
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:206
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:91
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:22
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:201
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:27
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:44
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:156712
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:202960
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:32
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:677
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:303
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:1606
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:1289082
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:267
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:61
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:206
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:91
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:22
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:201
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:27
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:44
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:156712
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:202960
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:32
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:677
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:190
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:210
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:148
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:73
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:31
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:18
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:10
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:201
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:25
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:266
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,48 +108,33 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:186
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:267
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:201
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:22
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:44
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:34
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:21
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/skype_udp.pcap.out b/test/results/stats/default/skype_udp.pcap.out
index 4022f7c27..24a1800c0 100644
--- a/test/results/stats/default/skype_udp.pcap.out
+++ b/test/results/stats/default/skype_udp.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:7642
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:111
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:18
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:7642
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:111
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:18
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/smb_deletefile.pcap.out b/test/results/stats/default/smb_deletefile.pcap.out
index 3441e1cef..c47d43c4a 100644
--- a/test/results/stats/default/smb_deletefile.pcap.out
+++ b/test/results/stats/default/smb_deletefile.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:11911
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:11034
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:14218
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:11911
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:11034
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:14218
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/smb_frags.pcap.out b/test/results/stats/default/smb_frags.pcap.out
index b4796dfee..024ae2e55 100644
--- a/test/results/stats/default/smb_frags.pcap.out
+++ b/test/results/stats/default/smb_frags.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:10315
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1651
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:536
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:10315
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1651
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:536
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -106,10 +131,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
diff --git a/test/results/stats/default/smbv1.pcap.out b/test/results/stats/default/smbv1.pcap.out
index 51ce5c6f5..aa08fb739 100644
--- a/test/results/stats/default/smbv1.pcap.out
+++ b/test/results/stats/default/smbv1.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:8869
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:453
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:366
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:8869
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:453
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:366
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -106,10 +131,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
diff --git a/test/results/stats/default/smpp_in_general.pcap.out b/test/results/stats/default/smpp_in_general.pcap.out
index aa1123764..1c3286ee6 100644
--- a/test/results/stats/default/smpp_in_general.pcap.out
+++ b/test/results/stats/default/smpp_in_general.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:7421
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:122
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:78
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:7421
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:122
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:78
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,13 +44,14 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/smtp-starttls.pcap.out b/test/results/stats/default/smtp-starttls.pcap.out
index ea48dd309..8a40a701e 100644
--- a/test/results/stats/default/smtp-starttls.pcap.out
+++ b/test/results/stats/default/smtp-starttls.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:28
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:26287
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:3118
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:6724
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:28
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:26287
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:3118
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:6724
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,9 +44,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,41 +108,26 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
@@ -119,8 +144,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_29_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_30_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_31_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_32_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_33_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_34_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_33_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_34_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_35_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_36_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_37_count" interval=60 N:0
diff --git a/test/results/stats/default/smtp.pcap.out b/test/results/stats/default/smtp.pcap.out
index 47a108e12..4beaaaeaf 100644
--- a/test/results/stats/default/smtp.pcap.out
+++ b/test/results/stats/default/smtp.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:9535
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:16527
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1428
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:9535
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:16527
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1428
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:1
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/smtps.pcapng.out b/test/results/stats/default/smtps.pcapng.out
index 5c0e1df27..559bbfc12 100644
--- a/test/results/stats/default/smtps.pcapng.out
+++ b/test/results/stats/default/smtps.pcapng.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:9318
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:517
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:179
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:9318
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:517
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:179
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,9 +44,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -101,8 +126,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
@@ -110,8 +135,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
diff --git a/test/results/stats/default/snapchat.pcap.out b/test/results/stats/default/snapchat.pcap.out
index 9aeeae594..19fe46fdf 100644
--- a/test/results/stats/default/snapchat.pcap.out
+++ b/test/results/stats/default/snapchat.pcap.out
@@ -1,38 +1,56 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:30
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:24739
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:4919
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:2196
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:30
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:24739
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:4919
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:2196
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -101,8 +126,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
@@ -110,8 +135,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
diff --git a/test/results/stats/default/snapchat_call.pcapng.out b/test/results/stats/default/snapchat_call.pcapng.out
index 6d5505fdb..a691cb674 100644
--- a/test/results/stats/default/snapchat_call.pcapng.out
+++ b/test/results/stats/default/snapchat_call.pcapng.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:19120
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:4245
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:6427
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:19120
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:4245
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:6427
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -36,7 +54,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interv
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -110,8 +135,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
diff --git a/test/results/stats/default/snapchat_call_v1.pcapng.out b/test/results/stats/default/snapchat_call_v1.pcapng.out
index 534aab8a3..ef1ea144f 100644
--- a/test/results/stats/default/snapchat_call_v1.pcapng.out
+++ b/test/results/stats/default/snapchat_call_v1.pcapng.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:18173
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:337357
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:7923
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:18173
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:337357
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:7923
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -36,7 +54,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interv
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/snmp.pcap.out b/test/results/stats/default/snmp.pcap.out
index 73a7ab3da..b783c0cb1 100644
--- a/test/results/stats/default/snmp.pcap.out
+++ b/test/results/stats/default/snmp.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:139
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:115543
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:17
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:17
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:17
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:7241
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:4130
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:65
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:139
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:115543
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:7241
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:4130
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:65
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:34
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:17
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:34
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:17
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:17
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:17
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -129,11 +154,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/soap.pcap.out b/test/results/stats/default/soap.pcap.out
index ad5584d02..29925ee68 100644
--- a/test/results/stats/default/soap.pcap.out
+++ b/test/results/stats/default/soap.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:24
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:27568
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:12465
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1933
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:24
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:27568
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:8109
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1637
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
diff --git a/test/results/stats/default/socks.pcap.out b/test/results/stats/default/socks.pcap.out
index 82699182d..76987a82a 100644
--- a/test/results/stats/default/socks.pcap.out
+++ b/test/results/stats/default/socks.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:36
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:24625
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:905
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:5743
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:20
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:36
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:24625
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:905
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:5743
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
diff --git a/test/results/stats/default/softether.pcap.out b/test/results/stats/default/softether.pcap.out
index b1002bc00..25b80eb09 100644
--- a/test/results/stats/default/softether.pcap.out
+++ b/test/results/stats/default/softether.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:107
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:91821
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:40
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:7165
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:6576
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:29
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:107
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:91821
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:40
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:7165
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:6576
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:29
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:51
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,8 +44,9 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:51
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/someip-tp.pcap.out b/test/results/stats/default/someip-tp.pcap.out
index d6991e446..21443d332 100644
--- a/test/results/stats/default/someip-tp.pcap.out
+++ b/test/results/stats/default/someip-tp.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:17011
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:12472
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:17011
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:12472
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
diff --git a/test/results/stats/default/someip-udp-method-call.pcapng.out b/test/results/stats/default/someip-udp-method-call.pcapng.out
index e024f5d01..c20cba5f2 100644
--- a/test/results/stats/default/someip-udp-method-call.pcapng.out
+++ b/test/results/stats/default/someip-udp-method-call.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:10035
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:353
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:25
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:10035
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:353
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:25
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
diff --git a/test/results/stats/default/someip_sd_sample.pcap.out b/test/results/stats/default/someip_sd_sample.pcap.out
index 6f8eaf502..46a3a6193 100644
--- a/test/results/stats/default/someip_sd_sample.pcap.out
+++ b/test/results/stats/default/someip_sd_sample.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:6555
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:6555
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/source_engine.pcap.out b/test/results/stats/default/source_engine.pcap.out
index 0b58ad9c5..f825fcd1d 100644
--- a/test/results/stats/default/source_engine.pcap.out
+++ b/test/results/stats/default/source_engine.pcap.out
@@ -1,32 +1,50 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:85
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:68659
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:17
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:17
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:17
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:425
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:17
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:85
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:68659
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:425
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:22
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:17
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -34,7 +52,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interva
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:22
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:17
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:17
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:17
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/sql_injection.pcap.out b/test/results/stats/default/sql_injection.pcap.out
index 19d3fd043..b738dda0d 100644
--- a/test/results/stats/default/sql_injection.pcap.out
+++ b/test/results/stats/default/sql_injection.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:11379
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:691
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1727
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:11379
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:691
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1727
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -98,8 +123,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
diff --git a/test/results/stats/default/srvloc-v1.pcapng.out b/test/results/stats/default/srvloc-v1.pcapng.out
index e9536f6c0..095979226 100644
--- a/test/results/stats/default/srvloc-v1.pcapng.out
+++ b/test/results/stats/default/srvloc-v1.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:8955
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:406
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:8955
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:406
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/srvloc.pcap.out b/test/results/stats/default/srvloc.pcap.out
index 1bcc30012..d030f2c47 100644
--- a/test/results/stats/default/srvloc.pcap.out
+++ b/test/results/stats/default/srvloc.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:3001
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:2439825
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:621
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:621
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:103
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:621
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:30707
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:629
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:404
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:3001
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:2439825
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:621
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:621
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:103
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:621
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:30707
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:629
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:404
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:724
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:621
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -42,7 +60,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interva
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:724
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:621
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:621
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:621
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:621
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:621
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:621
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/ssdp-m-search-ua.pcap.out b/test/results/stats/default/ssdp-m-search-ua.pcap.out
index e7dc9e231..0e70914f9 100644
--- a/test/results/stats/default/ssdp-m-search-ua.pcap.out
+++ b/test/results/stats/default/ssdp-m-search-ua.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:7717
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:696
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:7717
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:696
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/ssdp-m-search.pcap.out b/test/results/stats/default/ssdp-m-search.pcap.out
index f550894d7..461736fa2 100644
--- a/test/results/stats/default/ssdp-m-search.pcap.out
+++ b/test/results/stats/default/ssdp-m-search.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:8399
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:399
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:8399
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:399
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -44,13 +62,18 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/ssh.pcap.out b/test/results/stats/default/ssh.pcap.out
index 63b88218d..a04a08f6e 100644
--- a/test/results/stats/default/ssh.pcap.out
+++ b/test/results/stats/default/ssh.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:16
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:15532
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:5109
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:13389
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:15532
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:5109
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:13389
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -38,7 +56,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -104,9 +129,9 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
diff --git a/test/results/stats/default/ssl-cert-name-mismatch.pcap.out b/test/results/stats/default/ssl-cert-name-mismatch.pcap.out
index 21d6cc40e..e352f7bdd 100644
--- a/test/results/stats/default/ssl-cert-name-mismatch.pcap.out
+++ b/test/results/stats/default/ssl-cert-name-mismatch.pcap.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:10770
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:402
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:3608
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:10770
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:402
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:3608
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/starcraft_battle.pcap.out b/test/results/stats/default/starcraft_battle.pcap.out
index f56ca8280..a2aa44eac 100644
--- a/test/results/stats/default/starcraft_battle.pcap.out
+++ b/test/results/stats/default/starcraft_battle.pcap.out
@@ -1,32 +1,50 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:383
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:296737
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:52
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:26
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:26
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:39
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:16
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:11037
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:305631
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:203
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:383
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:296737
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:52
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:26
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:26
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:39
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:11037
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:305631
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:203
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:43
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:28
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -34,13 +52,13 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interva
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:27
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:22
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:1
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:39
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:52
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,42 +108,27 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:13
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:52
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:39
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
@@ -113,8 +138,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_29_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_30_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_31_count" interval=60 N:0
@@ -129,14 +154,14 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_51_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_52_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_53_count" interval=60 N:0
diff --git a/test/results/stats/default/steam.pcap.out b/test/results/stats/default/steam.pcap.out
index a10611799..51b0ce808 100644
--- a/test/results/stats/default/steam.pcap.out
+++ b/test/results/stats/default/steam.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:281
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:217287
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:58
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:58
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:58
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:2666
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:2072
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:101
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:281
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:217287
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:58
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:58
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:58
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:2666
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:2072
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:101
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:58
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:58
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:58
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:58
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:58
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:58
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/steam_datagram_relay_ping.pcapng.out b/test/results/stats/default/steam_datagram_relay_ping.pcapng.out
index f15bd309c..cd6c43a7a 100644
--- a/test/results/stats/default/steam_datagram_relay_ping.pcapng.out
+++ b/test/results/stats/default/steam_datagram_relay_ping.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:9229
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:2600
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:9229
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:2600
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:1
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/stun.pcap.out b/test/results/stats/default/stun.pcap.out
index baf9c1938..d9dd563ea 100644
--- a/test/results/stats/default/stun.pcap.out
+++ b/test/results/stats/default/stun.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:71
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:60646
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:8902
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:9008
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:31
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:71
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:60646
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:8902
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:9008
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:31
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -36,11 +54,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interv
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/stun_classic.pcap.out b/test/results/stats/default/stun_classic.pcap.out
index 010e1b646..1ea57ad97 100644
--- a/test/results/stats/default/stun_classic.pcap.out
+++ b/test/results/stats/default/stun_classic.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:7705
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:284
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:416
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:7705
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:284
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:416
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
diff --git a/test/results/stats/default/stun_dtls_unidirectional_client.pcap.out b/test/results/stats/default/stun_dtls_unidirectional_client.pcap.out
index cc0bf1913..6a1e5aff2 100644
--- a/test/results/stats/default/stun_dtls_unidirectional_client.pcap.out
+++ b/test/results/stats/default/stun_dtls_unidirectional_client.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:12640
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1456
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:12640
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1456
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -101,8 +126,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
@@ -110,8 +135,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/stun_dtls_unidirectional_server.pcap.out b/test/results/stats/default/stun_dtls_unidirectional_server.pcap.out
index a71ae7a3c..b1a6abfab 100644
--- a/test/results/stats/default/stun_dtls_unidirectional_server.pcap.out
+++ b/test/results/stats/default/stun_dtls_unidirectional_server.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:12367
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1311
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:12367
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1311
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,32 +108,17 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/stun_google_meet.pcapng.out b/test/results/stats/default/stun_google_meet.pcapng.out
index 3626c913c..fb36f0dd9 100644
--- a/test/results/stats/default/stun_google_meet.pcapng.out
+++ b/test/results/stats/default/stun_google_meet.pcapng.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:55
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:47149
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:10410
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:14309
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:29
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:55
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:47149
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:10410
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:14309
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:29
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
diff --git a/test/results/stats/default/stun_msteams_unidir.pcapng.out b/test/results/stats/default/stun_msteams_unidir.pcapng.out
index aa7aaf128..604119fcb 100644
--- a/test/results/stats/default/stun_msteams_unidir.pcapng.out
+++ b/test/results/stats/default/stun_msteams_unidir.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:11196
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:5440
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:11196
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:5440
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
diff --git a/test/results/stats/default/stun_signal.pcapng.out b/test/results/stats/default/stun_signal.pcapng.out
index 3c7480686..8ca27c599 100644
--- a/test/results/stats/default/stun_signal.pcapng.out
+++ b/test/results/stats/default/stun_signal.pcapng.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:211
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:169708
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:23
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:23
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:23
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:13408
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:16192
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:113
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:211
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:169708
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:23
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:23
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:23
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:13408
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:16192
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:113
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:46
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:23
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -36,11 +54,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interv
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:22
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:14
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:24
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:9
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:23
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:21
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:23
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:23
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:30
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:21
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/stun_tcp_multiple_msgs_same_pkt.pcap.out b/test/results/stats/default/stun_tcp_multiple_msgs_same_pkt.pcap.out
index 74a54a0bd..e2eaab886 100644
--- a/test/results/stats/default/stun_tcp_multiple_msgs_same_pkt.pcap.out
+++ b/test/results/stats/default/stun_tcp_multiple_msgs_same_pkt.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:7827
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:168
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:7827
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:168
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/stun_wa_call.pcapng.out b/test/results/stats/default/stun_wa_call.pcapng.out
index 03bb36259..043452a12 100644
--- a/test/results/stats/default/stun_wa_call.pcapng.out
+++ b/test/results/stats/default/stun_wa_call.pcapng.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:110
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:92248
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:44019
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:64856
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:61
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:110
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:92248
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:44019
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:64856
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:61
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:18
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:13
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -36,7 +54,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interv
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:12
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:13
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:12
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
diff --git a/test/results/stats/default/stun_zoom.pcapng.out b/test/results/stats/default/stun_zoom.pcapng.out
index 58d282ff9..ed436c7bd 100644
--- a/test/results/stats/default/stun_zoom.pcapng.out
+++ b/test/results/stats/default/stun_zoom.pcapng.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:27
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:26524
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:4671
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:10647
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:27
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:26524
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:4671
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:10647
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,17 +58,22 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -110,8 +135,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/syncthing.pcap.out b/test/results/stats/default/syncthing.pcap.out
index 10473c365..6e1c905d3 100644
--- a/test/results/stats/default/syncthing.pcap.out
+++ b/test/results/stats/default/syncthing.pcap.out
@@ -1,39 +1,57 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:40
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:37386
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:13912
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:40
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:37386
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:13912
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/synscan.pcap.out b/test/results/stats/default/synscan.pcap.out
index 4a09275b0..a816231ab 100644
--- a/test/results/stats/default/synscan.pcap.out
+++ b/test/results/stats/default/synscan.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:7996
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:6242867
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1994
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1989
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:124
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:1870
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:2011
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:7996
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:6242867
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1994
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1989
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:124
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:1870
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:2011
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1994
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1994
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:124
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:1870
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/syslog.pcap.out b/test/results/stats/default/syslog.pcap.out
index d521c2af1..1cecb8362 100644
--- a/test/results/stats/default/syslog.pcap.out
+++ b/test/results/stats/default/syslog.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:148
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:120568
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:19
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:18
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:17
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:15989
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:57
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:148
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:120568
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:19
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:18
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:13199
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:57
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:27
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:17
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -44,13 +62,18 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:27
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:17
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:19
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:16
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:19
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
diff --git a/test/results/stats/default/tailscale.pcap.out b/test/results/stats/default/tailscale.pcap.out
index 22d23d1f4..f098a228b 100644
--- a/test/results/stats/default/tailscale.pcap.out
+++ b/test/results/stats/default/tailscale.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:10195
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:5700
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:6322
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:10195
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:5700
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:6322
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/targusdataspeed_false_positives.pcap.out b/test/results/stats/default/targusdataspeed_false_positives.pcap.out
index 8cd131245..7f00cff0a 100644
--- a/test/results/stats/default/targusdataspeed_false_positives.pcap.out
+++ b/test/results/stats/default/targusdataspeed_false_positives.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:10299
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:196
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:575
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:10299
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:196
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:575
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,13 +44,14 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
diff --git a/test/results/stats/default/tcp_scan.pcapng.out b/test/results/stats/default/tcp_scan.pcapng.out
index 6f7ad3258..4d5e78cee 100644
--- a/test/results/stats/default/tcp_scan.pcapng.out
+++ b/test/results/stats/default/tcp_scan.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:42
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:30207
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:18
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:42
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:30207
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:18
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/teams.pcap.out b/test/results/stats/default/teams.pcap.out
index cce638f7a..4ef5163d2 100644
--- a/test/results/stats/default/teams.pcap.out
+++ b/test/results/stats/default/teams.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:674
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:635401
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:83
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:17
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:66
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:16
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:80
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:57
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:293772
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:293323
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:27
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:16
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:317
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:83
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:53
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:674
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:635401
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:83
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:66
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:80
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:57
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:293772
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:293323
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:27
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:317
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:42
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:37
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -36,12 +54,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interv
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:24
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:20
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:19
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:52
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:39
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:27
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:19
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:74
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:38
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:83
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,41 +108,26 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:40
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:16
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:16
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:83
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:80
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:10
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:33
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:33
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
@@ -129,14 +154,14 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_51_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_52_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_53_count" interval=60 N:0
diff --git a/test/results/stats/default/teamspeak3.pcap.out b/test/results/stats/default/teamspeak3.pcap.out
index 17c8b225b..d9e93a8a8 100644
--- a/test/results/stats/default/teamspeak3.pcap.out
+++ b/test/results/stats/default/teamspeak3.pcap.out
@@ -1,32 +1,50 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:260
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:218471
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:142
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:4245
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1872
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:99
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:260
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:218471
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:142
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:4245
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1872
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:99
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:144
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -36,7 +54,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interv
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:144
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/teamviewer.pcap.out b/test/results/stats/default/teamviewer.pcap.out
index b26ba2b5f..49261649c 100644
--- a/test/results/stats/default/teamviewer.pcap.out
+++ b/test/results/stats/default/teamviewer.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:23
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:22132
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:60849
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:93607
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:23
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:22132
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:60849
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:93607
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -38,7 +56,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -116,8 +141,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_29_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_30_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_31_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_30_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_31_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_32_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_33_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_34_count" interval=60 N:0
diff --git a/test/results/stats/default/telegram.pcap.out b/test/results/stats/default/telegram.pcap.out
index a0ec82c29..1c2fbde65 100644
--- a/test/results/stats/default/telegram.pcap.out
+++ b/test/results/stats/default/telegram.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:340
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:291377
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:48
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:48
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:46
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:159435
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:109098
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:163
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:60
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:340
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:291377
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:48
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:48
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:46
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:159435
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:109098
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:163
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:40
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -39,18 +57,23 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:12
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:41
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:20
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:46
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:45
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:48
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:48
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:46
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -108,8 +133,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
@@ -129,14 +154,14 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_51_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_52_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_53_count" interval=60 N:0
diff --git a/test/results/stats/default/telegram_videocall.pcapng.out b/test/results/stats/default/telegram_videocall.pcapng.out
index 9850eabc9..8b6e319f5 100644
--- a/test/results/stats/default/telegram_videocall.pcapng.out
+++ b/test/results/stats/default/telegram_videocall.pcapng.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:256
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:211213
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:34
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:28
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:25
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:59877
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:270358
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:16
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:134
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:256
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:211213
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:34
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:28
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:25
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:59877
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:270358
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:134
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:37
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:24
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -36,11 +54,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interv
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:26
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:19
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:28
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:31
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:19
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:34
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:25
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:28
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:28
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
diff --git a/test/results/stats/default/telnet.pcap.out b/test/results/stats/default/telnet.pcap.out
index cb5ecfc04..9aebf3729 100644
--- a/test/results/stats/default/telnet.pcap.out
+++ b/test/results/stats/default/telnet.pcap.out
@@ -1,32 +1,50 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:12110
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:289
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1371
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:12110
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:289
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1371
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -38,7 +56,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -108,8 +133,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
diff --git a/test/results/stats/default/teredo.pcap.out b/test/results/stats/default/teredo.pcap.out
index 607f828e6..a5bd419b7 100644
--- a/test/results/stats/default/teredo.pcap.out
+++ b/test/results/stats/default/teredo.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:33
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:24810
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:815
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:751
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:33
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:24810
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:815
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:751
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/tftp.pcap.out b/test/results/stats/default/tftp.pcap.out
index d8c7e53f3..5fa6a9279 100644
--- a/test/results/stats/default/tftp.pcap.out
+++ b/test/results/stats/default/tftp.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:41
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:35665
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:24916
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1228
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:41
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:35665
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:24888
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1228
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
diff --git a/test/results/stats/default/threema.pcap.out b/test/results/stats/default/threema.pcap.out
index e138bc95f..45c7d0ec8 100644
--- a/test/results/stats/default/threema.pcap.out
+++ b/test/results/stats/default/threema.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:54
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:37695
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:3785
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:2219
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:30
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:54
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:37695
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:3785
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:2219
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:30
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:4
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/thrift.pcap.out b/test/results/stats/default/thrift.pcap.out
index 7de3a8ace..e0e01a588 100644
--- a/test/results/stats/default/thrift.pcap.out
+++ b/test/results/stats/default/thrift.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:18
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:26118
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:23624
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:71295
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:18
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:26118
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:23624
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:71295
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/tinc.pcap.out b/test/results/stats/default/tinc.pcap.out
index 8dd2e359f..a32c25edd 100644
--- a/test/results/stats/default/tinc.pcap.out
+++ b/test/results/stats/default/tinc.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:37
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:40956
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:166919
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:171310
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:20
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:37
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:40956
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:166919
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:171310
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
diff --git a/test/results/stats/default/tk.pcap.out b/test/results/stats/default/tk.pcap.out
index 2e10b928a..c8563e339 100644
--- a/test/results/stats/default/tk.pcap.out
+++ b/test/results/stats/default/tk.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:21
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:16945
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:90
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:224
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:16945
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:90
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:224
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/tls-appdata.pcap.out b/test/results/stats/default/tls-appdata.pcap.out
index 8424441f3..3f04c3cf5 100644
--- a/test/results/stats/default/tls-appdata.pcap.out
+++ b/test/results/stats/default/tls-appdata.pcap.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:27
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:29019
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:12205
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:101176
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:27
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:29019
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:12205
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:101176
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/tls-esni-fuzzed.pcap.out b/test/results/stats/default/tls-esni-fuzzed.pcap.out
index 3586bc9a1..42d9e1f72 100644
--- a/test/results/stats/default/tls-esni-fuzzed.pcap.out
+++ b/test/results/stats/default/tls-esni-fuzzed.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:15726
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:2148
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:15726
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:2148
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -110,8 +135,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
@@ -138,5 +163,5 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_51_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_52_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_53_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_52_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_53_count" interval=60 N:1
diff --git a/test/results/stats/default/tls-rdn-extract.pcap.out b/test/results/stats/default/tls-rdn-extract.pcap.out
index ae979f23f..612953ddc 100644
--- a/test/results/stats/default/tls-rdn-extract.pcap.out
+++ b/test/results/stats/default/tls-rdn-extract.pcap.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:20903
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:127
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:6754
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:20903
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:127
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:6754
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,35 +108,20 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
diff --git a/test/results/stats/default/tls_2_reasms.pcapng.out b/test/results/stats/default/tls_2_reasms.pcapng.out
index 00476db95..667c8afe5 100644
--- a/test/results/stats/default/tls_2_reasms.pcapng.out
+++ b/test/results/stats/default/tls_2_reasms.pcapng.out
@@ -1,38 +1,56 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:11722
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:3685
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:2290
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:11722
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:3685
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:2290
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/tls_2_reasms_b.pcapng.out b/test/results/stats/default/tls_2_reasms_b.pcapng.out
index e1e41beb5..8e0190786 100644
--- a/test/results/stats/default/tls_2_reasms_b.pcapng.out
+++ b/test/results/stats/default/tls_2_reasms_b.pcapng.out
@@ -1,38 +1,56 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:11711
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:10270
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:2179
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:11711
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:10270
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:2179
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/tls_alert.pcap.out b/test/results/stats/default/tls_alert.pcap.out
index 2d50819e6..7299e8f26 100644
--- a/test/results/stats/default/tls_alert.pcap.out
+++ b/test/results/stats/default/tls_alert.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:21
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:15846
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:354
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:15846
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:354
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,15 +69,37 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_banned_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,33 +108,18 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
@@ -120,8 +145,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_30_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_31_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_32_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_33_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_34_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_35_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_34_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_35_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_36_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_37_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_38_count" interval=60 N:0
diff --git a/test/results/stats/default/tls_certificate_too_long.pcap.out b/test/results/stats/default/tls_certificate_too_long.pcap.out
index bb0a7da2f..c92a27d76 100644
--- a/test/results/stats/default/tls_certificate_too_long.pcap.out
+++ b/test/results/stats/default/tls_certificate_too_long.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:252
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:252461
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:35
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:24
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:33
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:26
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:37396
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:58312
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:116
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:36
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:23
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:252
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:252461
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:35
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:24
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:33
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:26
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:37396
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:58312
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:116
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:19
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:14
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -39,8 +57,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:18
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:29
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:15
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:33
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:34
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,30 +108,15 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:17
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:35
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:33
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
@@ -100,8 +125,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
@@ -118,8 +143,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_29_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_30_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_31_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_32_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_33_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_32_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_33_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_34_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_35_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_36_count" interval=60 N:0
@@ -129,11 +154,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/tls_cipher_lens.pcap.out b/test/results/stats/default/tls_cipher_lens.pcap.out
index 56a6a3329..74bcbfec3 100644
--- a/test/results/stats/default/tls_cipher_lens.pcap.out
+++ b/test/results/stats/default/tls_cipher_lens.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:23
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:21345
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:895
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:23
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:21345
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:895
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,33 +108,18 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
diff --git a/test/results/stats/default/tls_client_certificate_with_missing_server_one.pcapng.out b/test/results/stats/default/tls_client_certificate_with_missing_server_one.pcapng.out
index 91d1c8f2d..d564aad68 100644
--- a/test/results/stats/default/tls_client_certificate_with_missing_server_one.pcapng.out
+++ b/test/results/stats/default/tls_client_certificate_with_missing_server_one.pcapng.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:20
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:19670
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:2997
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1383
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:19670
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:2997
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1383
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -38,7 +56,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -101,8 +126,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
@@ -110,15 +135,15 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_29_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_30_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_30_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_31_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_32_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_32_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_33_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_34_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_35_count" interval=60 N:0
diff --git a/test/results/stats/default/tls_ech.pcapng.out b/test/results/stats/default/tls_ech.pcapng.out
index ad165d264..c6ac09beb 100644
--- a/test/results/stats/default/tls_ech.pcapng.out
+++ b/test/results/stats/default/tls_ech.pcapng.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:9965
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:648
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:2702
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:9965
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:648
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:2702
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/tls_esni_sni_both.pcap.out b/test/results/stats/default/tls_esni_sni_both.pcap.out
index e8b7fa77d..2f73eb4da 100644
--- a/test/results/stats/default/tls_esni_sni_both.pcap.out
+++ b/test/results/stats/default/tls_esni_sni_both.pcap.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:21
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:18979
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1691
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:12084
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:18979
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1691
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:12084
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -101,14 +126,14 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
diff --git a/test/results/stats/default/tls_false_positives.pcapng.out b/test/results/stats/default/tls_false_positives.pcapng.out
index 34d2e64b0..973676672 100644
--- a/test/results/stats/default/tls_false_positives.pcapng.out
+++ b/test/results/stats/default/tls_false_positives.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:9702
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:33806
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1875
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:9702
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:33806
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1875
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/tls_invalid_reads.pcap.out b/test/results/stats/default/tls_invalid_reads.pcap.out
index dcf8b1598..ee67d06ca 100644
--- a/test/results/stats/default/tls_invalid_reads.pcap.out
+++ b/test/results/stats/default/tls_invalid_reads.pcap.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:25
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:17496
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:112
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1329
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:25
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:17496
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:112
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1329
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,33 +108,18 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
diff --git a/test/results/stats/default/tls_long_cert.pcap.out b/test/results/stats/default/tls_long_cert.pcap.out
index 4b79fac54..51431ad93 100644
--- a/test/results/stats/default/tls_long_cert.pcap.out
+++ b/test/results/stats/default/tls_long_cert.pcap.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:14539
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:2858
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:102711
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:14539
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:2858
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:102711
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/tls_missing_ch_frag.pcap.out b/test/results/stats/default/tls_missing_ch_frag.pcap.out
index a3fd5f818..c135974b4 100644
--- a/test/results/stats/default/tls_missing_ch_frag.pcap.out
+++ b/test/results/stats/default/tls_missing_ch_frag.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:14615
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:6121
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:3029
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:14615
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:6121
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:3029
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/tls_multiple_synack_different_seq.pcapng.out b/test/results/stats/default/tls_multiple_synack_different_seq.pcapng.out
index 4fbc7e7e4..4c815dc8c 100644
--- a/test/results/stats/default/tls_multiple_synack_different_seq.pcapng.out
+++ b/test/results/stats/default/tls_multiple_synack_different_seq.pcapng.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:11945
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:5427
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:517
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:11945
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:5427
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:517
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -39,7 +57,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/tls_port_80.pcapng.out b/test/results/stats/default/tls_port_80.pcapng.out
index 515c5b045..94e7baf67 100644
--- a/test/results/stats/default/tls_port_80.pcapng.out
+++ b/test/results/stats/default/tls_port_80.pcapng.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:9723
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:245
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1360
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:9723
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:245
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1360
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -101,8 +126,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
@@ -110,8 +135,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
diff --git a/test/results/stats/default/tls_torrent.pcapng.out b/test/results/stats/default/tls_torrent.pcapng.out
index 23ef26fb6..bb72e4b2f 100644
--- a/test/results/stats/default/tls_torrent.pcapng.out
+++ b/test/results/stats/default/tls_torrent.pcapng.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:14869
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:5574
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:332
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:14869
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:5574
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:332
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -101,8 +126,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
diff --git a/test/results/stats/default/tls_unidirectional.pcap.out b/test/results/stats/default/tls_unidirectional.pcap.out
index 82b92dd3f..f7342bee4 100644
--- a/test/results/stats/default/tls_unidirectional.pcap.out
+++ b/test/results/stats/default/tls_unidirectional.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:21
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:26935
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:12447
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:26935
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:12447
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -110,15 +135,15 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_29_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_30_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_30_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_31_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_32_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_32_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_33_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_34_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_35_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/tls_verylong_certificate.pcap.out b/test/results/stats/default/tls_verylong_certificate.pcap.out
index 2b603f381..77ff26080 100644
--- a/test/results/stats/default/tls_verylong_certificate.pcap.out
+++ b/test/results/stats/default/tls_verylong_certificate.pcap.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:15828
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:844
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:18233
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:15828
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:844
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:18233
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/toca-boca.pcap.out b/test/results/stats/default/toca-boca.pcap.out
index 1ac56e537..ad10e9d89 100644
--- a/test/results/stats/default/toca-boca.pcap.out
+++ b/test/results/stats/default/toca-boca.pcap.out
@@ -1,32 +1,50 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:118
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:97727
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:21
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:21
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:17
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:11230
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:3960
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:37
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:118
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:97727
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:8377
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:3960
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:37
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:22
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:17
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -34,7 +52,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interva
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:22
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:17
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:21
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:21
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/tor.pcap.out b/test/results/stats/default/tor.pcap.out
index c21f7eaeb..7da82930b 100644
--- a/test/results/stats/default/tor.pcap.out
+++ b/test/results/stats/default/tor.pcap.out
@@ -1,37 +1,55 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:166
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:117676
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:42783
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:74483
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:32
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:47
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:166
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:117676
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:42783
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:74483
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:32
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:47
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:32
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -39,18 +57,23 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:10
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,33 +108,18 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:32
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:32
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:14
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
@@ -102,14 +127,14 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
@@ -127,8 +152,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_37_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_38_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
diff --git a/test/results/stats/default/tplink_shp.pcap.out b/test/results/stats/default/tplink_shp.pcap.out
index 37016e3c8..8a0a2672b 100644
--- a/test/results/stats/default/tplink_shp.pcap.out
+++ b/test/results/stats/default/tplink_shp.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:314
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:295302
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:241
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:7279
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:40
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:314
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:295302
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:241
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:7279
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:40
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:249
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:249
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/trickbot.pcap.out b/test/results/stats/default/trickbot.pcap.out
index e878652c1..d51ed909d 100644
--- a/test/results/stats/default/trickbot.pcap.out
+++ b/test/results/stats/default/trickbot.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:14083
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1277
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:56713
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:14083
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1277
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:56713
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,38 +108,23 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
@@ -111,8 +136,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_29_count" interval=60 N:0
diff --git a/test/results/stats/default/tumblr.pcap.out b/test/results/stats/default/tumblr.pcap.out
index ccb6d4104..99469b6a3 100644
--- a/test/results/stats/default/tumblr.pcap.out
+++ b/test/results/stats/default/tumblr.pcap.out
@@ -1,38 +1,56 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:329
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:282796
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:47
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:46
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:28
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:19
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:25
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:19532
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:275102
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:151
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:31
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:329
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:282796
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:47
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:46
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:28
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:19
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:25
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:19532
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:275102
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:151
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:35
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
@@ -51,15 +69,37 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_banned_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:19
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:47
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:47
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:19
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:28
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/tunnelbear.pcap.out b/test/results/stats/default/tunnelbear.pcap.out
index aa75ed093..91cd01ce5 100644
--- a/test/results/stats/default/tunnelbear.pcap.out
+++ b/test/results/stats/default/tunnelbear.pcap.out
@@ -1,41 +1,59 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:193
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:169563
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:21
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:20
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:19
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:29747
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:62330
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:105
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:32
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:193
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:169563
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:19
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:29747
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:62330
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:105
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:17
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:28
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:15
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
@@ -51,15 +69,37 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_banned_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:21
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -101,8 +126,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/tuya_lp.pcap.out b/test/results/stats/default/tuya_lp.pcap.out
index 0b534f03b..1984f70e1 100644
--- a/test/results/stats/default/tuya_lp.pcap.out
+++ b/test/results/stats/default/tuya_lp.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:107
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:88252
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:17832
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:65
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:107
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:88252
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:17832
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:65
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:13
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:13
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:13
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/ubntac2.pcap.out b/test/results/stats/default/ubntac2.pcap.out
index 3b7c9fad9..1b5c57c23 100644
--- a/test/results/stats/default/ubntac2.pcap.out
+++ b/test/results/stats/default/ubntac2.pcap.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:37
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:32050
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1400
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:37
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:32050
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1400
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/ultrasurf.pcap.out b/test/results/stats/default/ultrasurf.pcap.out
index 857542d33..3985c8f65 100644
--- a/test/results/stats/default/ultrasurf.pcap.out
+++ b/test/results/stats/default/ultrasurf.pcap.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:32
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:46045
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:139720
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:62485
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:32
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:46045
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:139720
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:62485
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -110,8 +135,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
@@ -138,5 +163,5 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_51_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_52_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_53_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_52_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_53_count" interval=60 N:4
diff --git a/test/results/stats/default/upnp.pcap.out b/test/results/stats/default/upnp.pcap.out
index 51d720d02..fbd8983cf 100644
--- a/test/results/stats/default/upnp.pcap.out
+++ b/test/results/stats/default/upnp.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:19
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:21380
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:9184
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:19
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:21380
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:9184
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/viber.pcap.out b/test/results/stats/default/viber.pcap.out
index cf5b9b95c..06a30c65b 100644
--- a/test/results/stats/default/viber.pcap.out
+++ b/test/results/stats/default/viber.pcap.out
@@ -1,46 +1,64 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:222
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:185605
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:29
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:23
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:25
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:19
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:30062
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:101892
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:102
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:222
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:185605
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:29
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:23
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:25
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:19
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:25565
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:100804
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:102
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:12
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:23
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:11
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:25
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:28
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:14
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:29
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:25
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/vk.pcapng.out b/test/results/stats/default/vk.pcapng.out
index e0c9aaefe..469642a1a 100644
--- a/test/results/stats/default/vk.pcapng.out
+++ b/test/results/stats/default/vk.pcapng.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:84
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:74819
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:66779
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:43
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:84
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:74819
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:66779
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:43
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:10
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:10
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/vnc.pcap.out b/test/results/stats/default/vnc.pcap.out
index cfbd23083..4db270d04 100644
--- a/test/results/stats/default/vnc.pcap.out
+++ b/test/results/stats/default/vnc.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:21
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:18481
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:81754
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:512
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:18481
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:81754
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:512
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -116,8 +141,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_29_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_30_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_31_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_30_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_31_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_32_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_33_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_34_count" interval=60 N:0
diff --git a/test/results/stats/default/vrrp3.pcapng.out b/test/results/stats/default/vrrp3.pcapng.out
index 9bbe27446..72d49d616 100644
--- a/test/results/stats/default/vrrp3.pcapng.out
+++ b/test/results/stats/default/vrrp3.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:10438
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:240
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:10438
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:240
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/vxlan.pcap.out b/test/results/stats/default/vxlan.pcap.out
index 63f329363..e400c5f1e 100644
--- a/test/results/stats/default/vxlan.pcap.out
+++ b/test/results/stats/default/vxlan.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:63
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:59701
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:79480
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:31
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:63
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:59701
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:79480
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:31
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:9
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:9
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:9
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/wa_video.pcap.out b/test/results/stats/default/wa_video.pcap.out
index 1b6f0aedb..d39e3df37 100644
--- a/test/results/stats/default/wa_video.pcap.out
+++ b/test/results/stats/default/wa_video.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:98
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:83834
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:264122
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:47653
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:50
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:98
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:83834
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:264122
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:47653
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:50
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:12
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:1
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:14
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:13
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
diff --git a/test/results/stats/default/wa_voice.pcap.out b/test/results/stats/default/wa_voice.pcap.out
index cfa0587a4..6e0a59aef 100644
--- a/test/results/stats/default/wa_voice.pcap.out
+++ b/test/results/stats/default/wa_voice.pcap.out
@@ -1,56 +1,79 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:207
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:177398
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:28
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:26
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:27
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:34223
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:94669
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:103
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:207
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:177398
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:28
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:26
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:27
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:34223
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:94669
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:103
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:36
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:25
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:25
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:27
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:21
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:28
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:27
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
diff --git a/test/results/stats/default/waze.pcap.out b/test/results/stats/default/waze.pcap.out
index 8584fa56a..bdfee68fe 100644
--- a/test/results/stats/default/waze.pcap.out
+++ b/test/results/stats/default/waze.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:282
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:227442
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:33
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:30
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:23
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:22
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:19999
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:306184
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:153
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:22
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:23
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:282
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:227442
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:33
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:30
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:23
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:22
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:19999
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:306184
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:153
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:10
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:42
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:21
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:23
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:38
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:33
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,34 +108,19 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:33
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:23
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:32
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:34
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
diff --git a/test/results/stats/default/webex.pcap.out b/test/results/stats/default/webex.pcap.out
index 4823e9889..4388e6f34 100644
--- a/test/results/stats/default/webex.pcap.out
+++ b/test/results/stats/default/webex.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:500
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:419111
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:57
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:45
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:53
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:39
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:67701
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:426653
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:51
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:279
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:52
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:42
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:500
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:419111
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:57
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:45
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:53
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:39
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:67701
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:426653
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:51
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:279
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:45
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,16 +44,17 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:56
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:47
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:36
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
@@ -51,15 +69,37 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_banned_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:53
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:101
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:57
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,41 +108,26 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:57
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:53
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:76
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:25
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:76
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:25
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:10
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
@@ -133,8 +158,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_51_count" interval=60 N:0
diff --git a/test/results/stats/default/websocket.pcap.out b/test/results/stats/default/websocket.pcap.out
index d21d923b4..e78b2efd6 100644
--- a/test/results/stats/default/websocket.pcap.out
+++ b/test/results/stats/default/websocket.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:7493
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:132
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:39
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:7493
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:132
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:39
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/wechat.pcap.out b/test/results/stats/default/wechat.pcap.out
index 0698794d9..a40723ace 100644
--- a/test/results/stats/default/wechat.pcap.out
+++ b/test/results/stats/default/wechat.pcap.out
@@ -1,56 +1,79 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:888
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:771195
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:109
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:52
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:57
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:77
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:17
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:25
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:84
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:69
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:184490
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:376782
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:394
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:116
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:101
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:888
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:771195
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:109
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:52
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:57
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:77
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:25
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:84
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:69
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:184490
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:376782
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:394
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:42
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:34
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:9
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:80
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:27
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:119
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:43
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:84
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:100
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:9
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:40
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:10
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:109
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:84
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:25
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -94,8 +119,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
@@ -108,8 +133,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:9
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/weibo.pcap.out b/test/results/stats/default/weibo.pcap.out
index 5ddc7b4b5..cb5e81e3e 100644
--- a/test/results/stats/default/weibo.pcap.out
+++ b/test/results/stats/default/weibo.pcap.out
@@ -1,32 +1,50 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:267
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:220965
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:44
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:43
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:21
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:23
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:9449
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:225426
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:117
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:267
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:220965
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:44
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:43
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:23
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:9449
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:225426
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:117
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:16
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:12
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:23
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:44
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:14
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:44
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:23
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -102,8 +127,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
@@ -113,8 +138,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_29_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_30_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_31_count" interval=60 N:0
@@ -135,8 +160,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_51_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_52_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_53_count" interval=60 N:0
diff --git a/test/results/stats/default/whatsapp.pcap.out b/test/results/stats/default/whatsapp.pcap.out
index 733fb54f3..4bb70cdd6 100644
--- a/test/results/stats/default/whatsapp.pcap.out
+++ b/test/results/stats/default/whatsapp.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:751
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:562472
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:86
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:86
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:86
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:50635
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:86
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:430
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:61
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:751
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:562472
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:86
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:86
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:86
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:50635
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:86
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:430
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:61
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:86
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:86
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:86
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:86
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:86
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:86
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:86
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:86
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/whatsapp_login_call.pcap.out b/test/results/stats/default/whatsapp_login_call.pcap.out
index a28c2b1c3..829fb5985 100644
--- a/test/results/stats/default/whatsapp_login_call.pcap.out
+++ b/test/results/stats/default/whatsapp_login_call.pcap.out
@@ -1,56 +1,79 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:461
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:378089
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:57
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:24
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:33
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:45
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:20
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:37
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:81240
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:51420
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:226
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:76
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:461
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:378089
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:57
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:24
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:33
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:45
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:37
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:81240
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:51420
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:226
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:30
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:50
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:20
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:25
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:33
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:55
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:29
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:57
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:37
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -101,8 +126,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/whatsapp_login_chat.pcap.out b/test/results/stats/default/whatsapp_login_chat.pcap.out
index e2daef8c4..c8227e2db 100644
--- a/test/results/stats/default/whatsapp_login_chat.pcap.out
+++ b/test/results/stats/default/whatsapp_login_chat.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:61
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:57107
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:19160
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:5639
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:27
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:61
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:57107
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:19160
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:5639
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:27
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/whatsapp_voice_and_message.pcap.out b/test/results/stats/default/whatsapp_voice_and_message.pcap.out
index 351de78bb..278a46466 100644
--- a/test/results/stats/default/whatsapp_voice_and_message.pcap.out
+++ b/test/results/stats/default/whatsapp_voice_and_message.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:126
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:102775
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:16
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:8982
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:5407
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:65
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:126
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:102775
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:8982
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:5407
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:65
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:29
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:13
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -36,7 +54,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interv
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:24
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:13
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/whatsappfiles.pcap.out b/test/results/stats/default/whatsappfiles.pcap.out
index 719b5114a..d96b5a549 100644
--- a/test/results/stats/default/whatsappfiles.pcap.out
+++ b/test/results/stats/default/whatsappfiles.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:24
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:23180
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:179714
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:230629
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:24
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:23180
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:179714
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:230629
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,13 +44,14 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/whois.pcapng.out b/test/results/stats/default/whois.pcapng.out
index 4d2021715..89fa4713e 100644
--- a/test/results/stats/default/whois.pcapng.out
+++ b/test/results/stats/default/whois.pcapng.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:30
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:26423
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:3467
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1453
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:30
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:26423
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:3467
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1453
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -110,8 +135,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
@@ -138,5 +163,5 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_51_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_52_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_53_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_52_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_53_count" interval=60 N:2
diff --git a/test/results/stats/default/windowsupdate_over_http.pcap.out b/test/results/stats/default/windowsupdate_over_http.pcap.out
index 74fced03d..0ff526404 100644
--- a/test/results/stats/default/windowsupdate_over_http.pcap.out
+++ b/test/results/stats/default/windowsupdate_over_http.pcap.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:9632
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:479
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:14400
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:9632
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:479
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:14400
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,38 +108,23 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
diff --git a/test/results/stats/default/wireguard.pcap.out b/test/results/stats/default/wireguard.pcap.out
index cd69218c6..6398fb132 100644
--- a/test/results/stats/default/wireguard.pcap.out
+++ b/test/results/stats/default/wireguard.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:21
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:16909
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:7268
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:3288
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:16909
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:7268
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:3288
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,8 +44,9 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/wow.pcap.out b/test/results/stats/default/wow.pcap.out
index cddfa31f2..a040f806a 100644
--- a/test/results/stats/default/wow.pcap.out
+++ b/test/results/stats/default/wow.pcap.out
@@ -1,32 +1,50 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:45
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:32038
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:2812
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1774
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:25
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:45
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:32038
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:2812
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1774
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:25
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -34,7 +52,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interva
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -97,8 +122,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
@@ -133,8 +158,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_51_count" interval=60 N:0
diff --git a/test/results/stats/default/xdmcp.pcap.out b/test/results/stats/default/xdmcp.pcap.out
index 12672509b..8056c5b46 100644
--- a/test/results/stats/default/xdmcp.pcap.out
+++ b/test/results/stats/default/xdmcp.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:7529
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:254
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:81
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:7529
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:254
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:81
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/xiaomi.pcap.out b/test/results/stats/default/xiaomi.pcap.out
index a6dee4fe6..9896a2868 100644
--- a/test/results/stats/default/xiaomi.pcap.out
+++ b/test/results/stats/default/xiaomi.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:58
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:47187
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:3913
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:4078
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:30
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:58
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:47187
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:3913
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:4078
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:30
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -98,8 +123,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
diff --git a/test/results/stats/default/xss.pcap.out b/test/results/stats/default/xss.pcap.out
index 597aa52c2..6c9a924ee 100644
--- a/test/results/stats/default/xss.pcap.out
+++ b/test/results/stats/default/xss.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:17
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:12972
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:608
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1843
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:12972
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:608
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1843
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -98,8 +123,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
diff --git a/test/results/stats/default/yandex.pcapng.out b/test/results/stats/default/yandex.pcapng.out
index 6d6bdb3d1..c2ef3356d 100644
--- a/test/results/stats/default/yandex.pcapng.out
+++ b/test/results/stats/default/yandex.pcapng.out
@@ -1,37 +1,55 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:84
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:73196
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:19090
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:29801
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:45
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:84
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:73196
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:19090
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:29801
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:45
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -39,27 +57,49 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_banned_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:9
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -127,13 +152,13 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_37_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_38_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/youtube_quic.pcap.out b/test/results/stats/default/youtube_quic.pcap.out
index a6472d30a..847072451 100644
--- a/test/results/stats/default/youtube_quic.pcap.out
+++ b/test/results/stats/default/youtube_quic.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:28
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:38664
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:16934
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:162567
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:28
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:38664
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:16934
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:162567
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:1
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:2
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/youtubeupload.pcap.out b/test/results/stats/default/youtubeupload.pcap.out
index b1c4cf8ce..d8e095f3e 100644
--- a/test/results/stats/default/youtubeupload.pcap.out
+++ b/test/results/stats/default/youtubeupload.pcap.out
@@ -1,33 +1,51 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:30
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:40499
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:105513
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:15573
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:15
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:30
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:40499
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:105513
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:15573
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/z3950.pcapng.out b/test/results/stats/default/z3950.pcapng.out
index add9cfa6b..2e6a7786f 100644
--- a/test/results/stats/default/z3950.pcapng.out
+++ b/test/results/stats/default/z3950.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:20
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:13681
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:678
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:8035
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:13681
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:445
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:4117
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
diff --git a/test/results/stats/default/zabbix.pcap.out b/test/results/stats/default/zabbix.pcap.out
index 2a9fc6be9..2ed3d94a7 100644
--- a/test/results/stats/default/zabbix.pcap.out
+++ b/test/results/stats/default/zabbix.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:196
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:141612
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:24
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:24
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:24
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:5346
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:3265
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:120
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:196
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:141612
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:24
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:24
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:24
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:5346
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:3265
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:120
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:24
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:24
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:24
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:24
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:24
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/default/zattoo.pcap.out b/test/results/stats/default/zattoo.pcap.out
index 37cd048ae..6eaf0c396 100644
--- a/test/results/stats/default/zattoo.pcap.out
+++ b/test/results/stats/default/zattoo.pcap.out
@@ -1,32 +1,50 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:20
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:17983
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:7381
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:4290
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:17983
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:7381
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:4290
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -47,10 +65,15 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -94,15 +119,15 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
@@ -118,8 +143,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_29_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_30_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_31_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_32_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_33_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_32_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_33_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_34_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_35_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_36_count" interval=60 N:0
diff --git a/test/results/stats/default/zcash.pcap.out b/test/results/stats/default/zcash.pcap.out
index 31bb1d310..94a3bbf56 100644
--- a/test/results/stats/default/zcash.pcap.out
+++ b/test/results/stats/default/zcash.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:10913
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:6299
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:4723
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:10913
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:6299
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:4723
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -108,8 +133,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
diff --git a/test/results/stats/default/zoom.pcap.out b/test/results/stats/default/zoom.pcap.out
index c427ee55a..269856639 100644
--- a/test/results/stats/default/zoom.pcap.out
+++ b/test/results/stats/default/zoom.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:252
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:214963
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:33
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:27
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:31
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:26
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:69672
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:259806
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:115
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:48
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:252
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:214963
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:33
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:27
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:31
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:26
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:69672
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:259806
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:115
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:26
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -40,17 +58,22 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:18
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:11
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:28
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:13
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:31
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:21
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:33
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,41 +108,26 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:17
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:33
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:31
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:17
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:17
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
@@ -129,11 +154,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/default/zoom2.pcap.out b/test/results/stats/default/zoom2.pcap.out
index 683e90ef2..64e9d5cce 100644
--- a/test/results/stats/default/zoom2.pcap.out
+++ b/test/results/stats/default/zoom2.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:48
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:41357
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:294574
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:251877
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:25
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:48
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:41357
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:294574
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:251877
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:25
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -47,10 +65,15 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -101,8 +126,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
diff --git a/test/results/stats/default/zoom_p2p.pcapng.out b/test/results/stats/default/zoom_p2p.pcapng.out
index bfed972ef..76276d777 100644
--- a/test/results/stats/default/zoom_p2p.pcapng.out
+++ b/test/results/stats/default/zoom_p2p.pcapng.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:131
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:107239
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:27
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:137033
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:103149
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:58
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:131
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:107239
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:27
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:137033
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:103149
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:58
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:32
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:9
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -39,18 +57,23 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:13
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:11
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/disable_aggressiveness/ookla.pcap.out b/test/results/stats/disable_aggressiveness/ookla.pcap.out
index dae999140..8b08790a1 100644
--- a/test/results/stats/disable_aggressiveness/ookla.pcap.out
+++ b/test/results/stats/disable_aggressiveness/ookla.pcap.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:56
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:44131
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:22919
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:9629
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:30
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:56
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:44131
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:22732
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:8117
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:30
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -133,8 +158,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_51_count" interval=60 N:0
diff --git a/test/results/stats/disable_protocols/dns_long_domainname.pcap.out b/test/results/stats/disable_protocols/dns_long_domainname.pcap.out
index c42a6d407..3d4546eb8 100644
--- a/test/results/stats/disable_protocols/dns_long_domainname.pcap.out
+++ b/test/results/stats/disable_protocols/dns_long_domainname.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:7492
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:61
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:117
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:7492
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:61
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:117
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -129,8 +154,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
diff --git a/test/results/stats/disable_protocols/pluralsight.pcap.out b/test/results/stats/disable_protocols/pluralsight.pcap.out
index 0f6ad3307..ece44be0a 100644
--- a/test/results/stats/disable_protocols/pluralsight.pcap.out
+++ b/test/results/stats/disable_protocols/pluralsight.pcap.out
@@ -1,32 +1,50 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:59
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:73214
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:3540
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:23176
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:28
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:59
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:73214
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:3540
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:23176
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:28
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -43,7 +61,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/disable_protocols/quic-mvfst-27.pcapng.out b/test/results/stats/disable_protocols/quic-mvfst-27.pcapng.out
index 306ac4329..36500f1c7 100644
--- a/test/results/stats/disable_protocols/quic-mvfst-27.pcapng.out
+++ b/test/results/stats/disable_protocols/quic-mvfst-27.pcapng.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:15633
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:2538
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:6981
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:15633
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:2538
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:6981
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:1
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
diff --git a/test/results/stats/disable_protocols/soap.pcap.out b/test/results/stats/disable_protocols/soap.pcap.out
index 0a4920939..5e65c631e 100644
--- a/test/results/stats/disable_protocols/soap.pcap.out
+++ b/test/results/stats/disable_protocols/soap.pcap.out
@@ -1,23 +1,40 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:24
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:27808
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:12465
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:1933
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:11
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:24
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:27808
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:8109
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:1637
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:11
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
diff --git a/test/results/stats/disable_stun_monitoring/lru_ipv6_caches.pcapng.out b/test/results/stats/disable_stun_monitoring/lru_ipv6_caches.pcapng.out
index 2092be1f5..a0f3990fe 100644
--- a/test/results/stats/disable_stun_monitoring/lru_ipv6_caches.pcapng.out
+++ b/test/results/stats/disable_stun_monitoring/lru_ipv6_caches.pcapng.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:85
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:87791
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:14408
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:846
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:41
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:85
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:87791
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:14408
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:846
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:41
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:16
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:11
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,13 +44,14 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:3
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:12
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:9
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:12
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:7
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
@@ -132,8 +157,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:10
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/enable_doh_heuristic/doh.pcapng.out b/test/results/stats/enable_doh_heuristic/doh.pcapng.out
index 62390addd..06c77c7a6 100644
--- a/test/results/stats/enable_doh_heuristic/doh.pcapng.out
+++ b/test/results/stats/enable_doh_heuristic/doh.pcapng.out
@@ -1,24 +1,41 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:12305
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:1881
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:5821
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:12305
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:1881
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:5821
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -27,11 +44,12 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -110,8 +135,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_28_count" interval=60 N:0
@@ -138,5 +163,5 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_51_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_52_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_53_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_52_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_53_count" interval=60 N:2
diff --git a/test/results/stats/enable_payload_stat/1kxun.pcap.out b/test/results/stats/enable_payload_stat/1kxun.pcap.out
index 87b97fdde..bc2dcfd50 100644
--- a/test/results/stats/enable_payload_stat/1kxun.pcap.out
+++ b/test/results/stats/enable_payload_stat/1kxun.pcap.out
@@ -1,56 +1,79 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:1303
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:1558068
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:197
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:188
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:38
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:6
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:177
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:33
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:14
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:167344
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:2271410
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:35
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:624
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:12
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:157
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:72
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:1303
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:1558068
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:197
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:188
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:38
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:13
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:177
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:33
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:14
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:156501
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:2270815
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:35
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:624
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:116
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:53
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:56
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:39
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:7
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:96
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:63
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:46
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:34
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:45
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:22
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:2
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:177
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:34
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:20
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:172
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:25
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,48 +108,33 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:99
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:197
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:177
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:6
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:14
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:10
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:13
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_19_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
@@ -125,15 +150,15 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_35_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_36_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_37_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_38_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:10
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:3
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:13
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:13
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/enable_stun_monitoring_with_subproto/wa_voice.pcap.out b/test/results/stats/enable_stun_monitoring_with_subproto/wa_voice.pcap.out
index 9f643a9c0..63f2e47f0 100644
--- a/test/results/stats/enable_stun_monitoring_with_subproto/wa_voice.pcap.out
+++ b/test/results/stats/enable_stun_monitoring_with_subproto/wa_voice.pcap.out
@@ -1,56 +1,79 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:207
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:183401
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:28
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:26
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:4
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:27
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:8
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:34223
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:94669
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:103
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:207
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:183401
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:28
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:26
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:27
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:34223
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:94669
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:103
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:36
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:25
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_chat_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:7
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:17
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:8
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_system_count" interval=60 N:5
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_software_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_music_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:25
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:27
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,31 +108,16 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:21
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:28
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:27
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_9_count" interval=60 N:0
-- 
cgit v1.2.3