Introduce icmp tracking