Updated hsw group base on domain name