Adapt design for sniffer