Added some IPv6 support