Added demo support for both IPv4 and IPv6