WP-2351 Adding in new field groups