WP-2351 Adding new fields