Fixes: WP-344, WP-344. Require fields