Initial support for legacy groups, see #139