not done in that PR because here we created group next to variant group before to refactor more deeply.