Added support for additional group-by and IPV-6