Added preliminary support for subgroups