WP-2317 Adding in fields for the fpp