Added IPv6 support