Added resolveGroupSelector option