Refactor: universal support for 2 level groups