Integrate subgroups improvements into main dist plugin