Update for IPv6 compatibility