Further changes to sniffer