Added support for IP tracking