Add support back for resolving group names in NodeResolver