Enhancement: Added support for IPV6