Replacing IPv4 only with both IPv4 and IPv6 support