Model - re-enable resolving of subgroups