Added NS group support