Adding IPv6 support