To be honest, this is so much more complicated than the legacy groups.
Ultimately I used this solution: Mixed Entity Groups