Make account affinity groups use generate wrappers