Add group visibility and field groups