WP-2354 Adding in new fields